--- a/jdk/make/java/java/FILES_java.gmk Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/make/java/java/FILES_java.gmk Mon Jan 21 11:16:36 2013 -0800
@@ -373,6 +373,11 @@
java/util/concurrent/atomic/AtomicReferenceArray.java \
java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
java/util/concurrent/atomic/AtomicStampedReference.java \
+ java/util/concurrent/atomic/DoubleAccumulator.java \
+ java/util/concurrent/atomic/DoubleAdder.java \
+ java/util/concurrent/atomic/LongAccumulator.java \
+ java/util/concurrent/atomic/LongAdder.java \
+ java/util/concurrent/atomic/Striped64.java \
java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
--- a/jdk/make/tools/src/build/tools/cldrconverter/Bundle.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/make/tools/src/build/tools/cldrconverter/Bundle.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -274,7 +274,7 @@
handleDateTimeFormatPatterns(DATETIME_PATTERN_KEYS, myMap, parentsMap, calendarType, "DateTimePatterns");
}
- // if myMap has any empty timezone or metazone names, weed out them.
+ // First, weed out any empty timezone or metazone names from myMap.
// Fill in any missing abbreviations if locale is "en".
for (Iterator<String> it = myMap.keySet().iterator(); it.hasNext();) {
String key = it.next();
@@ -426,7 +426,7 @@
/*
* Adjusts String[] for era names because JRE's Calendars use different
- * ERA value indexes in the Buddhist and Japanese Imperial calendars.
+ * ERA value indexes in the Buddhist, Japanese Imperial, and Islamic calendars.
*/
private void adjustEraNames(Map<String, Object> map, CalendarType type) {
String[][] eraNames = new String[ERA_KEYS.length][];
@@ -458,6 +458,11 @@
// Replace the value
value = new String[] {"BC", value[0]};
break;
+
+ case ISLAMIC:
+ // Replace the value
+ value = new String[] {"", value[0]};
+ break;
}
if (!key.equals(realKey)) {
map.put(realKey, value);
@@ -479,6 +484,7 @@
for (String k : patternKeys) {
if (myMap.containsKey(calendarPrefix + k)) {
int len = patternKeys.length;
+ List<String> rawPatterns = new ArrayList<>();
List<String> patterns = new ArrayList<>();
for (int i = 0; i < len; i++) {
String key = calendarPrefix + patternKeys[i];
@@ -487,6 +493,7 @@
pattern = (String) parentsMap.remove(key);
}
if (pattern != null) {
+ rawPatterns.add(i, pattern);
patterns.add(i, translateDateFormatLetters(calendarType, pattern));
}
}
@@ -494,6 +501,9 @@
return;
}
String key = calendarPrefix + name;
+ if (!rawPatterns.equals(patterns)) {
+ myMap.put("cldr." + key, rawPatterns.toArray(new String[len]));
+ }
myMap.put(key, patterns.toArray(new String[len]));
break;
}
--- a/jdk/make/tools/src/build/tools/cldrconverter/CLDRConverter.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/make/tools/src/build/tools/cldrconverter/CLDRConverter.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,7 @@
static final String LOCALE_NAME_PREFIX = "locale.displayname.";
static final String CURRENCY_SYMBOL_PREFIX = "currency.symbol.";
static final String CURRENCY_NAME_PREFIX = "currency.displayname.";
+ static final String CALENDAR_NAME_PREFIX = "calendarname.";
static final String TIMEZONE_ID_PREFIX = "timezone.id.";
static final String ZONE_NAME_PREFIX = "timezone.displayname.";
static final String METAZONE_ID_PREFIX = "metazone.id.";
@@ -519,35 +520,70 @@
return calendarData;
}
+ static final String[] FORMAT_DATA_ELEMENTS = {
+ "MonthNames",
+ "standalone.MonthNames",
+ "MonthAbbreviations",
+ "standalone.MonthAbbreviations",
+ "MonthNarrow",
+ "standalone.MonthNarrows",
+ "DayNames",
+ "standalone.DayNames",
+ "DayAbbreviations",
+ "standalone.DayAbbreviations",
+ "DayNarrows",
+ "standalone.DayNarrows",
+ "AmPmMarkers",
+ "narrow.AmPmMarkers",
+ "long.Eras",
+ "Eras",
+ "narrow.Eras",
+ "field.era",
+ "field.year",
+ "field.month",
+ "field.week",
+ "field.weekday",
+ "field.dayperiod",
+ "field.hour",
+ "field.minute",
+ "field.second",
+ "field.zone",
+ "TimePatterns",
+ "DatePatterns",
+ "DateTimePatterns",
+ "DateTimePatternChars"
+ };
+
private static Map<String, Object> extractFormatData(Map<String, Object> map, String id) {
Map<String, Object> formatData = new LinkedHashMap<>();
for (CalendarType calendarType : CalendarType.values()) {
String prefix = calendarType.keyElementName();
- copyIfPresent(map, prefix + "MonthNames", formatData); // default FORMAT since JDK8
- copyIfPresent(map, prefix + "standalone.MonthNames", formatData);
- copyIfPresent(map, prefix + "MonthAbbreviations", formatData);
- copyIfPresent(map, prefix + "standalone.MonthAbbreviations", formatData);
- copyIfPresent(map, prefix + "MonthNarrow", formatData);
- copyIfPresent(map, prefix + "standalone.MonthNarrows", formatData);
- copyIfPresent(map, prefix + "DayNames", formatData);
- copyIfPresent(map, prefix + "standalone.DayNames", formatData);
- copyIfPresent(map, prefix + "DayAbbreviations", formatData);
- copyIfPresent(map, prefix + "standalone.DayAbbreviations", formatData);
- copyIfPresent(map, prefix + "DayNarrows", formatData);
- copyIfPresent(map, prefix + "standalone.DayNarrows", formatData);
- copyIfPresent(map, prefix + "AmPmMarkers", formatData);
- copyIfPresent(map, prefix + "narrow.AmPmMarkers", formatData);
- copyIfPresent(map, prefix + "long.Eras", formatData);
- copyIfPresent(map, prefix + "Eras", formatData);
- copyIfPresent(map, prefix + "narrow.Eras", formatData);
- copyIfPresent(map, prefix + "TimePatterns", formatData);
- copyIfPresent(map, prefix + "DatePatterns", formatData);
- copyIfPresent(map, prefix + "DateTimePatterns", formatData);
- copyIfPresent(map, prefix + "DateTimePatternChars", formatData);
+ for (String element : FORMAT_DATA_ELEMENTS) {
+ String key = prefix + element;
+ copyIfPresent(map, "cldr." + key, formatData);
+ copyIfPresent(map, key, formatData);
+ }
+ }
+
+ // Copy available calendar names
+ for (String key : map.keySet()) {
+ if (key.startsWith(CLDRConverter.CALENDAR_NAME_PREFIX)) {
+ String type = key.substring(CLDRConverter.CALENDAR_NAME_PREFIX.length());
+ for (CalendarType calendarType : CalendarType.values()) {
+ if (type.equals(calendarType.lname())) {
+ Object value = map.get(key);
+ formatData.put(key, value);
+ String ukey = CLDRConverter.CALENDAR_NAME_PREFIX + calendarType.uname();
+ if (!key.equals(ukey)) {
+ formatData.put(ukey, value);
+ }
+ }
+ }
+ }
}
copyIfPresent(map, "DefaultNumberingSystem", formatData);
- String defaultScript = (String) map.get("DefaultNumberingSystem");
+
@SuppressWarnings("unchecked")
List<String> numberingScripts = (List<String>) map.remove("numberingScripts");
if (numberingScripts != null) {
--- a/jdk/make/tools/src/build/tools/cldrconverter/CalendarType.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/make/tools/src/build/tools/cldrconverter/CalendarType.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,26 +31,42 @@
* Constants for the Calendars supported by JRE.
*/
enum CalendarType {
-
- GREGORIAN, BUDDHIST, JAPANESE;
+ GREGORIAN("gregory"), BUDDHIST, JAPANESE, ROC, ISLAMIC, ISLAMIC_CIVIL("islamicc");
private static final int[][] ERA_DATA = {
// start index, array length
{0, 2}, // gregorian
{0, 1}, // buddhist
{232, 4}, // japanese (eras from Meiji)
+ {0, 2}, // roc (Minguo)
+ {0, 1}, // islamic (Hijrah)
+ {0, 1}, // islamicc (same as islamic)
};
private final String lname; // lowercase name
+ private final String uname; // unicode key name (e.g., "gregory" for GREGORIAN)
private CalendarType() {
- lname = name().toLowerCase(Locale.ROOT);
+ this(null);
+ }
+
+ private CalendarType(String uname) {
+ String lname = name().toLowerCase(Locale.ROOT);
+ if (lname.equals("islamic_civil")) {
+ lname = "islamic-civil";
+ }
+ this.lname = lname;
+ this.uname = (uname != null) ? uname : lname;
}
String lname() {
return lname;
}
+ String uname() {
+ return uname;
+ }
+
String keyElementName() {
return (this == GREGORIAN) ? "" : lname + ".";
}
--- a/jdk/make/tools/src/build/tools/cldrconverter/LDMLParseHandler.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/make/tools/src/build/tools/cldrconverter/LDMLParseHandler.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,6 +71,13 @@
// ignore this element - it has language and territory elements that aren't locale data
pushIgnoredContainer(qName);
break;
+ case "type":
+ if ("calendar".equals(attributes.getValue("key"))) {
+ pushStringEntry(qName, attributes, CLDRConverter.CALENDAR_NAME_PREFIX + attributes.getValue("type"));
+ } else {
+ pushIgnoredContainer(qName);
+ }
+ break;
case "language":
// for LocaleNames
// copy string
@@ -98,19 +105,30 @@
case "symbol":
// for CurrencyNames
// need to get the key from the containing <currency> element
- pushStringEntry(qName, attributes, CLDRConverter.CURRENCY_SYMBOL_PREFIX + getContainerKey());
+ pushStringEntry(qName, attributes, CLDRConverter.CURRENCY_SYMBOL_PREFIX
+ + getContainerKey());
break;
+
+ // Calendar or currency
case "displayName":
- // for CurrencyNames
- // need to get the key from the containing <currency> element
- // ignore if is has "count" attribute
- String containerKey = getContainerKey();
- if (containerKey != null && attributes.getValue("count") == null) {
- pushStringEntry(qName, attributes,
- CLDRConverter.CURRENCY_NAME_PREFIX + containerKey.toLowerCase(Locale.ROOT),
- attributes.getValue("type"));
- } else {
- pushIgnoredContainer(qName);
+ {
+ if (currentCalendarType != null) {
+ pushStringEntry(qName, attributes,
+ currentCalendarType.keyElementName() + "field." + getContainerKey());
+ } else {
+ // for CurrencyNames
+ // need to get the key from the containing <currency> element
+ // ignore if is has "count" attribute
+ String containerKey = getContainerKey();
+ if (containerKey != null && attributes.getValue("count") == null) {
+ pushStringEntry(qName, attributes,
+ CLDRConverter.CURRENCY_NAME_PREFIX
+ + containerKey.toLowerCase(Locale.ROOT),
+ attributes.getValue("type"));
+ } else {
+ pushIgnoredContainer(qName);
+ }
+ }
}
break;
@@ -130,6 +148,35 @@
}
}
break;
+ case "fields":
+ if (currentCalendarType != null) {
+ pushContainer(qName, attributes);
+ } else {
+ pushIgnoredContainer(qName);
+ }
+ break;
+ case "field":
+ {
+ String type = attributes.getValue("type");
+ switch (type) {
+ case "era":
+ case "year":
+ case "month":
+ case "week":
+ case "weekday":
+ case "dayperiod":
+ case "hour":
+ case "minute":
+ case "second":
+ case "zone":
+ pushKeyContainer(qName, attributes, type);
+ break;
+ default:
+ pushIgnoredContainer(qName);
+ break;
+ }
+ }
+ break;
case "monthContext":
{
// for FormatData
--- a/jdk/src/share/classes/java/sql/BatchUpdateException.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/java/sql/BatchUpdateException.java Mon Jan 21 11:16:36 2013 -0800
@@ -409,7 +409,7 @@
* <code>cause</code> and <code>updateCounts</code>.
* <p>
* This constructor should be used when the returned update count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
* <p>
* @param reason a description of the error
* @param SQLState an XOPEN or SQL:2003 code identifying the exception
@@ -447,7 +447,7 @@
* the <code>BatchUpdateException</code> was thrown.
* <p>
* This method should be used when {@code Statement.executeLargeBatch} is
- * invoked and the returned update count may exceed {@link Integer.MAX_VALUE}.
+ * invoked and the returned update count may exceed {@link Integer#MAX_VALUE}.
* <p>
* @return an array of <code>long</code> containing the update counts
* for the updates that were executed successfully before this error
--- a/jdk/src/share/classes/java/sql/PreparedStatement.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/java/sql/PreparedStatement.java Mon Jan 21 11:16:36 2013 -0800
@@ -1300,7 +1300,7 @@
* such as a DDL statement.
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
* <p>
* The default implementation will throw {@code UnsupportedOperationException}
*
--- a/jdk/src/share/classes/java/sql/Statement.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/java/sql/Statement.java Mon Jan 21 11:16:36 2013 -0800
@@ -1077,7 +1077,7 @@
* is returned. This method should be called only once per result.
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
*<p>
* The default implementation will throw {@code UnsupportedOperationException}
*
@@ -1100,7 +1100,7 @@
* rows are silently dropped.
* <p>
* This method should be used when the row limit may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
*<p>
* The default implementation will throw {@code UnsupportedOperationException}
*
@@ -1122,7 +1122,7 @@
* the excess rows are silently dropped.
* <p>
* This method should be used when the returned row limit may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
*<p>
* The default implementation will return {@code 0}
*
@@ -1172,7 +1172,7 @@
* </OL>
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
*<p>
* The default implementation will throw {@code UnsupportedOperationException}
*
@@ -1203,7 +1203,7 @@
* SQL statement that returns nothing, such as an SQL DDL statement.
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
* <p>
* <strong>Note:</strong>This method cannot be called on a
* <code>PreparedStatement</code> or <code>CallableStatement</code>.
@@ -1242,7 +1242,7 @@
* auto-generated keys (the list of such statements is vendor-specific).
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
* <p>
* <strong>Note:</strong>This method cannot be called on a
* <code>PreparedStatement</code> or <code>CallableStatement</code>.
@@ -1290,7 +1290,7 @@
* auto-generated keys (the list of such statements is vendor-specific).
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
* <p>
* <strong>Note:</strong>This method cannot be called on a
* <code>PreparedStatement</code> or <code>CallableStatement</code>.
@@ -1334,7 +1334,7 @@
* auto-generated keys (the list of such statements is vendor-specific).
* <p>
* This method should be used when the returned row count may exceed
- * {@link Integer.MAX_VALUE}.
+ * {@link Integer#MAX_VALUE}.
* <p>
* <strong>Note:</strong>This method cannot be called on a
* <code>PreparedStatement</code> or <code>CallableStatement</code>.
@@ -1368,4 +1368,3 @@
throw new SQLFeatureNotSupportedException("executeLargeUpdate not implemented");
}
}
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAccumulator.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,239 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent.atomic;
+import java.io.Serializable;
+import java.util.function.DoubleBinaryOperator;
+
+/**
+ * One or more variables that together maintain a running {@code double}
+ * value updated using a supplied function. When updates (method
+ * {@link #accumulate}) are contended across threads, the set of variables
+ * may grow dynamically to reduce contention. Method {@link #get}
+ * (or, equivalently, {@link #doubleValue}) returns the current value
+ * across the variables maintaining updates.
+ *
+ * <p>This class is usually preferable to alternatives when multiple
+ * threads update a common value that is used for purposes such as
+ * summary statistics that are frequently updated but less frequently
+ * read.
+ *
+ * <p>The supplied accumulator function should be side-effect-free,
+ * since it may be re-applied when attempted updates fail due to
+ * contention among threads. The function is applied with the current
+ * value as its first argument, and the given update as the second
+ * argument. For example, to maintain a running maximum value, you
+ * could supply {@code Double::max} along with {@code
+ * Double.NEGATIVE_INFINITY} as the identity. The order of
+ * accumulation within or across threads is not guaranteed. Thus, this
+ * class may not be applicable if numerical stability is required,
+ * especially when combining values of substantially different orders
+ * of magnitude.
+ *
+ * <p>Class {@link DoubleAdder} provides analogs of the functionality
+ * of this class for the common special case of maintaining sums. The
+ * call {@code new DoubleAdder()} is equivalent to {@code new
+ * DoubleAccumulator((x, y) -> x + y, 0.0}.
+ *
+ * <p>This class extends {@link Number}, but does <em>not</em> define
+ * methods such as {@code equals}, {@code hashCode} and {@code
+ * compareTo} because instances are expected to be mutated, and so are
+ * not useful as collection keys.
+ *
+ * @since 1.8
+ * @author Doug Lea
+ */
+public class DoubleAccumulator extends Striped64 implements Serializable {
+ private static final long serialVersionUID = 7249069246863182397L;
+
+ private final DoubleBinaryOperator function;
+ private final long identity; // use long representation
+
+ /**
+ * Creates a new instance using the given accumulator function
+ * and identity element.
+ */
+ public DoubleAccumulator(DoubleBinaryOperator accumulatorFunction,
+ double identity) {
+ this.function = accumulatorFunction;
+ base = this.identity = Double.doubleToRawLongBits(identity);
+ }
+
+ /**
+ * Updates with the given value.
+ *
+ * @param x the value
+ */
+ public void accumulate(double x) {
+ Cell[] as; long b, v, r; int m; Cell a;
+ if ((as = cells) != null ||
+ (r = Double.doubleToRawLongBits
+ (function.operateAsDouble
+ (Double.longBitsToDouble(b = base), x))) != b && !casBase(b, r)) {
+ boolean uncontended = true;
+ if (as == null || (m = as.length - 1) < 0 ||
+ (a = as[getProbe() & m]) == null ||
+ !(uncontended =
+ (r = Double.doubleToRawLongBits
+ (function.operateAsDouble
+ (Double.longBitsToDouble(v = a.value), x))) == v ||
+ a.cas(v, r)))
+ doubleAccumulate(x, function, uncontended);
+ }
+ }
+
+ /**
+ * Returns the current value. The returned value is <em>NOT</em>
+ * an atomic snapshot; invocation in the absence of concurrent
+ * updates returns an accurate result, but concurrent updates that
+ * occur while the value is being calculated might not be
+ * incorporated.
+ *
+ * @return the current value
+ */
+ public double get() {
+ Cell[] as = cells; Cell a;
+ double result = Double.longBitsToDouble(base);
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ result = function.operateAsDouble
+ (result, Double.longBitsToDouble(a.value));
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Resets variables maintaining updates to the identity value.
+ * This method may be a useful alternative to creating a new
+ * updater, but is only effective if there are no concurrent
+ * updates. Because this method is intrinsically racy, it should
+ * only be used when it is known that no threads are concurrently
+ * updating.
+ */
+ public void reset() {
+ Cell[] as = cells; Cell a;
+ base = identity;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ a.value = identity;
+ }
+ }
+ }
+
+ /**
+ * Equivalent in effect to {@link #get} followed by {@link
+ * #reset}. This method may apply for example during quiescent
+ * points between multithreaded computations. If there are
+ * updates concurrent with this method, the returned value is
+ * <em>not</em> guaranteed to be the final value occurring before
+ * the reset.
+ *
+ * @return the value before reset
+ */
+ public double getThenReset() {
+ Cell[] as = cells; Cell a;
+ double result = Double.longBitsToDouble(base);
+ base = identity;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null) {
+ double v = Double.longBitsToDouble(a.value);
+ a.value = identity;
+ result = function.operateAsDouble(result, v);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns the String representation of the current value.
+ * @return the String representation of the current value
+ */
+ public String toString() {
+ return Double.toString(get());
+ }
+
+ /**
+ * Equivalent to {@link #get}.
+ *
+ * @return the current value
+ */
+ public double doubleValue() {
+ return get();
+ }
+
+ /**
+ * Returns the {@linkplain #get current value} as a {@code long}
+ * after a narrowing primitive conversion.
+ */
+ public long longValue() {
+ return (long)get();
+ }
+
+ /**
+ * Returns the {@linkplain #get current value} as an {@code int}
+ * after a narrowing primitive conversion.
+ */
+ public int intValue() {
+ return (int)get();
+ }
+
+ /**
+ * Returns the {@linkplain #get current value} as a {@code float}
+ * after a narrowing primitive conversion.
+ */
+ public float floatValue() {
+ return (float)get();
+ }
+
+ private void writeObject(java.io.ObjectOutputStream s)
+ throws java.io.IOException {
+ s.defaultWriteObject();
+ s.writeDouble(get());
+ }
+
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
+ s.defaultReadObject();
+ cellsBusy = 0;
+ cells = null;
+ base = Double.doubleToRawLongBits(s.readDouble());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/DoubleAdder.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,227 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent.atomic;
+import java.io.Serializable;
+
+/**
+ * One or more variables that together maintain an initially zero
+ * {@code double} sum. When updates (method {@link #add}) are
+ * contended across threads, the set of variables may grow dynamically
+ * to reduce contention. Method {@link #sum} (or, equivalently {@link
+ * #doubleValue}) returns the current total combined across the
+ * variables maintaining the sum. The order of accumulation within or
+ * across threads is not guaranteed. Thus, this class may not be
+ * applicable if numerical stability is required, especially when
+ * combining values of substantially different orders of magnitude.
+ *
+ * <p>This class is usually preferable to alternatives when multiple
+ * threads update a common value that is used for purposes such as
+ * summary statistics that are frequently updated but less frequently
+ * read.
+ *
+ * <p>This class extends {@link Number}, but does <em>not</em> define
+ * methods such as {@code equals}, {@code hashCode} and {@code
+ * compareTo} because instances are expected to be mutated, and so are
+ * not useful as collection keys.
+ *
+ * @since 1.8
+ * @author Doug Lea
+ */
+public class DoubleAdder extends Striped64 implements Serializable {
+ private static final long serialVersionUID = 7249069246863182397L;
+
+ /**
+ * Note that we must use "long" for underlying representations,
+ * because there is no compareAndSet for double, due to the fact
+ * that the bitwise equals used in any CAS implementation is not
+ * the same as double-precision equals. However, we use CAS only
+ * to detect and alleviate contention, for which bitwise equals
+ * works best anyway. In principle, the long/double conversions
+ * used here should be essentially free on most platforms since
+ * they just re-interpret bits.
+ */
+
+ /**
+ * Creates a new adder with initial sum of zero.
+ */
+ public DoubleAdder() {
+ }
+
+ /**
+ * Adds the given value.
+ *
+ * @param x the value to add
+ */
+ public void add(double x) {
+ Cell[] as; long b, v; int m; Cell a;
+ if ((as = cells) != null ||
+ !casBase(b = base,
+ Double.doubleToRawLongBits
+ (Double.longBitsToDouble(b) + x))) {
+ boolean uncontended = true;
+ if (as == null || (m = as.length - 1) < 0 ||
+ (a = as[getProbe() & m]) == null ||
+ !(uncontended = a.cas(v = a.value,
+ Double.doubleToRawLongBits
+ (Double.longBitsToDouble(v) + x))))
+ doubleAccumulate(x, null, uncontended);
+ }
+ }
+
+ /**
+ * Returns the current sum. The returned value is <em>NOT</em> an
+ * atomic snapshot; invocation in the absence of concurrent
+ * updates returns an accurate result, but concurrent updates that
+ * occur while the sum is being calculated might not be
+ * incorporated. Also, because floating-point arithmetic is not
+ * strictly associative, the returned result need not be identical
+ * to the value that would be obtained in a sequential series of
+ * updates to a single variable.
+ *
+ * @return the sum
+ */
+ public double sum() {
+ Cell[] as = cells; Cell a;
+ double sum = Double.longBitsToDouble(base);
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ sum += Double.longBitsToDouble(a.value);
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * Resets variables maintaining the sum to zero. This method may
+ * be a useful alternative to creating a new adder, but is only
+ * effective if there are no concurrent updates. Because this
+ * method is intrinsically racy, it should only be used when it is
+ * known that no threads are concurrently updating.
+ */
+ public void reset() {
+ Cell[] as = cells; Cell a;
+ base = 0L; // relies on fact that double 0 must have same rep as long
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ a.value = 0L;
+ }
+ }
+ }
+
+ /**
+ * Equivalent in effect to {@link #sum} followed by {@link
+ * #reset}. This method may apply for example during quiescent
+ * points between multithreaded computations. If there are
+ * updates concurrent with this method, the returned value is
+ * <em>not</em> guaranteed to be the final value occurring before
+ * the reset.
+ *
+ * @return the sum
+ */
+ public double sumThenReset() {
+ Cell[] as = cells; Cell a;
+ double sum = Double.longBitsToDouble(base);
+ base = 0L;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null) {
+ long v = a.value;
+ a.value = 0L;
+ sum += Double.longBitsToDouble(v);
+ }
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * Returns the String representation of the {@link #sum}.
+ * @return the String representation of the {@link #sum}
+ */
+ public String toString() {
+ return Double.toString(sum());
+ }
+
+ /**
+ * Equivalent to {@link #sum}.
+ *
+ * @return the sum
+ */
+ public double doubleValue() {
+ return sum();
+ }
+
+ /**
+ * Returns the {@link #sum} as a {@code long} after a
+ * narrowing primitive conversion.
+ */
+ public long longValue() {
+ return (long)sum();
+ }
+
+ /**
+ * Returns the {@link #sum} as an {@code int} after a
+ * narrowing primitive conversion.
+ */
+ public int intValue() {
+ return (int)sum();
+ }
+
+ /**
+ * Returns the {@link #sum} as a {@code float}
+ * after a narrowing primitive conversion.
+ */
+ public float floatValue() {
+ return (float)sum();
+ }
+
+ private void writeObject(java.io.ObjectOutputStream s)
+ throws java.io.IOException {
+ s.defaultWriteObject();
+ s.writeDouble(sum());
+ }
+
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
+ s.defaultReadObject();
+ cellsBusy = 0;
+ cells = null;
+ base = Double.doubleToRawLongBits(s.readDouble());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/LongAccumulator.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,236 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent.atomic;
+import java.io.Serializable;
+import java.util.function.LongBinaryOperator;
+
+/**
+ * One or more variables that together maintain a running {@code long}
+ * value updated using a supplied function. When updates (method
+ * {@link #accumulate}) are contended across threads, the set of variables
+ * may grow dynamically to reduce contention. Method {@link #get}
+ * (or, equivalently, {@link #longValue}) returns the current value
+ * across the variables maintaining updates.
+ *
+ * <p>This class is usually preferable to {@link AtomicLong} when
+ * multiple threads update a common value that is used for purposes such
+ * as collecting statistics, not for fine-grained synchronization
+ * control. Under low update contention, the two classes have similar
+ * characteristics. But under high contention, expected throughput of
+ * this class is significantly higher, at the expense of higher space
+ * consumption.
+ *
+ * <p>The order of accumulation within or across threads is not
+ * guaranteed and cannot be depended upon, so this class is only
+ * applicable to functions for which the order of accumulation does
+ * not matter. The supplied accumulator function should be
+ * side-effect-free, since it may be re-applied when attempted updates
+ * fail due to contention among threads. The function is applied with
+ * the current value as its first argument, and the given update as
+ * the second argument. For example, to maintain a running maximum
+ * value, you could supply {@code Long::max} along with {@code
+ * Long.MIN_VALUE} as the identity.
+ *
+ * <p>Class {@link LongAdder} provides analogs of the functionality of
+ * this class for the common special case of maintaining counts and
+ * sums. The call {@code new LongAdder()} is equivalent to {@code new
+ * LongAccumulator((x, y) -> x + y, 0L}.
+ *
+ * <p>This class extends {@link Number}, but does <em>not</em> define
+ * methods such as {@code equals}, {@code hashCode} and {@code
+ * compareTo} because instances are expected to be mutated, and so are
+ * not useful as collection keys.
+ *
+ * @since 1.8
+ * @author Doug Lea
+ */
+public class LongAccumulator extends Striped64 implements Serializable {
+ private static final long serialVersionUID = 7249069246863182397L;
+
+ private final LongBinaryOperator function;
+ private final long identity;
+
+ /**
+ * Creates a new instance using the given accumulator function
+ * and identity element.
+ */
+ public LongAccumulator(LongBinaryOperator accumulatorFunction,
+ long identity) {
+ this.function = accumulatorFunction;
+ base = this.identity = identity;
+ }
+
+ /**
+ * Updates with the given value.
+ *
+ * @param x the value
+ */
+ public void accumulate(long x) {
+ Cell[] as; long b, v, r; int m; Cell a;
+ if ((as = cells) != null ||
+ (r = function.operateAsLong(b = base, x)) != b && !casBase(b, r)) {
+ boolean uncontended = true;
+ if (as == null || (m = as.length - 1) < 0 ||
+ (a = as[getProbe() & m]) == null ||
+ !(uncontended =
+ (r = function.operateAsLong(v = a.value, x)) == v ||
+ a.cas(v, r)))
+ longAccumulate(x, function, uncontended);
+ }
+ }
+
+ /**
+ * Returns the current value. The returned value is <em>NOT</em>
+ * an atomic snapshot; invocation in the absence of concurrent
+ * updates returns an accurate result, but concurrent updates that
+ * occur while the value is being calculated might not be
+ * incorporated.
+ *
+ * @return the current value
+ */
+ public long get() {
+ Cell[] as = cells; Cell a;
+ long result = base;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ result = function.operateAsLong(result, a.value);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Resets variables maintaining updates to the identity value.
+ * This method may be a useful alternative to creating a new
+ * updater, but is only effective if there are no concurrent
+ * updates. Because this method is intrinsically racy, it should
+ * only be used when it is known that no threads are concurrently
+ * updating.
+ */
+ public void reset() {
+ Cell[] as = cells; Cell a;
+ base = identity;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ a.value = identity;
+ }
+ }
+ }
+
+ /**
+ * Equivalent in effect to {@link #get} followed by {@link
+ * #reset}. This method may apply for example during quiescent
+ * points between multithreaded computations. If there are
+ * updates concurrent with this method, the returned value is
+ * <em>not</em> guaranteed to be the final value occurring before
+ * the reset.
+ *
+ * @return the value before reset
+ */
+ public long getThenReset() {
+ Cell[] as = cells; Cell a;
+ long result = base;
+ base = identity;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null) {
+ long v = a.value;
+ a.value = identity;
+ result = function.operateAsLong(result, v);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns the String representation of the current value.
+ * @return the String representation of the current value
+ */
+ public String toString() {
+ return Long.toString(get());
+ }
+
+ /**
+ * Equivalent to {@link #get}.
+ *
+ * @return the current value
+ */
+ public long longValue() {
+ return get();
+ }
+
+ /**
+ * Returns the {@linkplain #get current value} as an {@code int}
+ * after a narrowing primitive conversion.
+ */
+ public int intValue() {
+ return (int)get();
+ }
+
+ /**
+ * Returns the {@linkplain #get current value} as a {@code float}
+ * after a widening primitive conversion.
+ */
+ public float floatValue() {
+ return (float)get();
+ }
+
+ /**
+ * Returns the {@linkplain #get current value} as a {@code double}
+ * after a widening primitive conversion.
+ */
+ public double doubleValue() {
+ return (double)get();
+ }
+
+ private void writeObject(java.io.ObjectOutputStream s)
+ throws java.io.IOException {
+ s.defaultWriteObject();
+ s.writeLong(get());
+ }
+
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
+ s.defaultReadObject();
+ cellsBusy = 0;
+ cells = null;
+ base = s.readLong();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/LongAdder.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,228 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent.atomic;
+import java.io.Serializable;
+
+/**
+ * One or more variables that together maintain an initially zero
+ * {@code long} sum. When updates (method {@link #add}) are contended
+ * across threads, the set of variables may grow dynamically to reduce
+ * contention. Method {@link #sum} (or, equivalently, {@link
+ * #longValue}) returns the current total combined across the
+ * variables maintaining the sum.
+ *
+ * <p>This class is usually preferable to {@link AtomicLong} when
+ * multiple threads update a common sum that is used for purposes such
+ * as collecting statistics, not for fine-grained synchronization
+ * control. Under low update contention, the two classes have similar
+ * characteristics. But under high contention, expected throughput of
+ * this class is significantly higher, at the expense of higher space
+ * consumption.
+ *
+ * <p>LongAdders can be used with a {@link
+ * java.util.concurrent.ConcurrentHashMap} to maintain a scalable
+ * frequency map (a form of histogram or multiset). For example, to
+ * add a count to a {@code ConcurrentHashMap<String,LongAdder> freqs},
+ * initializing if not already present, you can use {@code
+ * freqs.computeIfAbsent(k -> new LongAdder()).increment();}
+ *
+ * <p>This class extends {@link Number}, but does <em>not</em> define
+ * methods such as {@code equals}, {@code hashCode} and {@code
+ * compareTo} because instances are expected to be mutated, and so are
+ * not useful as collection keys.
+ *
+ * @since 1.8
+ * @author Doug Lea
+ */
+public class LongAdder extends Striped64 implements Serializable {
+ private static final long serialVersionUID = 7249069246863182397L;
+
+ /**
+ * Creates a new adder with initial sum of zero.
+ */
+ public LongAdder() {
+ }
+
+ /**
+ * Adds the given value.
+ *
+ * @param x the value to add
+ */
+ public void add(long x) {
+ Cell[] as; long b, v; int m; Cell a;
+ if ((as = cells) != null || !casBase(b = base, b + x)) {
+ boolean uncontended = true;
+ if (as == null || (m = as.length - 1) < 0 ||
+ (a = as[getProbe() & m]) == null ||
+ !(uncontended = a.cas(v = a.value, v + x)))
+ longAccumulate(x, null, uncontended);
+ }
+ }
+
+ /**
+ * Equivalent to {@code add(1)}.
+ */
+ public void increment() {
+ add(1L);
+ }
+
+ /**
+ * Equivalent to {@code add(-1)}.
+ */
+ public void decrement() {
+ add(-1L);
+ }
+
+ /**
+ * Returns the current sum. The returned value is <em>NOT</em> an
+ * atomic snapshot; invocation in the absence of concurrent
+ * updates returns an accurate result, but concurrent updates that
+ * occur while the sum is being calculated might not be
+ * incorporated.
+ *
+ * @return the sum
+ */
+ public long sum() {
+ Cell[] as = cells; Cell a;
+ long sum = base;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ sum += a.value;
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * Resets variables maintaining the sum to zero. This method may
+ * be a useful alternative to creating a new adder, but is only
+ * effective if there are no concurrent updates. Because this
+ * method is intrinsically racy, it should only be used when it is
+ * known that no threads are concurrently updating.
+ */
+ public void reset() {
+ Cell[] as = cells; Cell a;
+ base = 0L;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null)
+ a.value = 0L;
+ }
+ }
+ }
+
+ /**
+ * Equivalent in effect to {@link #sum} followed by {@link
+ * #reset}. This method may apply for example during quiescent
+ * points between multithreaded computations. If there are
+ * updates concurrent with this method, the returned value is
+ * <em>not</em> guaranteed to be the final value occurring before
+ * the reset.
+ *
+ * @return the sum
+ */
+ public long sumThenReset() {
+ Cell[] as = cells; Cell a;
+ long sum = base;
+ base = 0L;
+ if (as != null) {
+ for (int i = 0; i < as.length; ++i) {
+ if ((a = as[i]) != null) {
+ sum += a.value;
+ a.value = 0L;
+ }
+ }
+ }
+ return sum;
+ }
+
+ /**
+ * Returns the String representation of the {@link #sum}.
+ * @return the String representation of the {@link #sum}
+ */
+ public String toString() {
+ return Long.toString(sum());
+ }
+
+ /**
+ * Equivalent to {@link #sum}.
+ *
+ * @return the sum
+ */
+ public long longValue() {
+ return sum();
+ }
+
+ /**
+ * Returns the {@link #sum} as an {@code int} after a narrowing
+ * primitive conversion.
+ */
+ public int intValue() {
+ return (int)sum();
+ }
+
+ /**
+ * Returns the {@link #sum} as a {@code float}
+ * after a widening primitive conversion.
+ */
+ public float floatValue() {
+ return (float)sum();
+ }
+
+ /**
+ * Returns the {@link #sum} as a {@code double} after a widening
+ * primitive conversion.
+ */
+ public double doubleValue() {
+ return (double)sum();
+ }
+
+ private void writeObject(java.io.ObjectOutputStream s)
+ throws java.io.IOException {
+ s.defaultWriteObject();
+ s.writeLong(sum());
+ }
+
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
+ s.defaultReadObject();
+ cellsBusy = 0;
+ cells = null;
+ base = s.readLong();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/Striped64.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,417 @@
+/*
+ * 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.
+ */
+
+/*
+ * This file is available under and governed by the GNU General Public
+ * License version 2 only, as published by the Free Software Foundation.
+ * However, the following notice accompanied the original version of this
+ * file:
+ *
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+package java.util.concurrent.atomic;
+import java.util.function.LongBinaryOperator;
+import java.util.function.DoubleBinaryOperator;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * A package-local class holding common representation and mechanics
+ * for classes supporting dynamic striping on 64bit values. The class
+ * extends Number so that concrete subclasses must publicly do so.
+ */
+abstract class Striped64 extends Number {
+ /*
+ * This class maintains a lazily-initialized table of atomically
+ * updated variables, plus an extra "base" field. The table size
+ * is a power of two. Indexing uses masked per-thread hash codes.
+ * Nearly all declarations in this class are package-private,
+ * accessed directly by subclasses.
+ *
+ * Table entries are of class Cell; a variant of AtomicLong padded
+ * to reduce cache contention on most processors. Padding is
+ * overkill for most Atomics because they are usually irregularly
+ * scattered in memory and thus don't interfere much with each
+ * other. But Atomic objects residing in arrays will tend to be
+ * placed adjacent to each other, and so will most often share
+ * cache lines (with a huge negative performance impact) without
+ * this precaution.
+ *
+ * In part because Cells are relatively large, we avoid creating
+ * them until they are needed. When there is no contention, all
+ * updates are made to the base field. Upon first contention (a
+ * failed CAS on base update), the table is initialized to size 2.
+ * The table size is doubled upon further contention until
+ * reaching the nearest power of two greater than or equal to the
+ * number of CPUS. Table slots remain empty (null) until they are
+ * needed.
+ *
+ * A single spinlock ("cellsBusy") is used for initializing and
+ * resizing the table, as well as populating slots with new Cells.
+ * There is no need for a blocking lock; when the lock is not
+ * available, threads try other slots (or the base). During these
+ * retries, there is increased contention and reduced locality,
+ * which is still better than alternatives.
+ *
+ * The Thread probe fields maintained via ThreadLocalRandom serve
+ * as per-thread hash codes. We let them remain uninitialized as
+ * zero (if they come in this way) until they contend at slot
+ * 0. They are then initialized to values that typically do not
+ * often conflict with others. Contention and/or table collisions
+ * are indicated by failed CASes when performing an update
+ * operation. Upon a collision, if the table size is less than
+ * the capacity, it is doubled in size unless some other thread
+ * holds the lock. If a hashed slot is empty, and lock is
+ * available, a new Cell is created. Otherwise, if the slot
+ * exists, a CAS is tried. Retries proceed by "double hashing",
+ * using a secondary hash (Marsaglia XorShift) to try to find a
+ * free slot.
+ *
+ * The table size is capped because, when there are more threads
+ * than CPUs, supposing that each thread were bound to a CPU,
+ * there would exist a perfect hash function mapping threads to
+ * slots that eliminates collisions. When we reach capacity, we
+ * search for this mapping by randomly varying the hash codes of
+ * colliding threads. Because search is random, and collisions
+ * only become known via CAS failures, convergence can be slow,
+ * and because threads are typically not bound to CPUS forever,
+ * may not occur at all. However, despite these limitations,
+ * observed contention rates are typically low in these cases.
+ *
+ * It is possible for a Cell to become unused when threads that
+ * once hashed to it terminate, as well as in the case where
+ * doubling the table causes no thread to hash to it under
+ * expanded mask. We do not try to detect or remove such cells,
+ * under the assumption that for long-running instances, observed
+ * contention levels will recur, so the cells will eventually be
+ * needed again; and for short-lived ones, it does not matter.
+ */
+
+ /**
+ * Padded variant of AtomicLong supporting only raw accesses plus CAS.
+ * The value field is placed between pads, hoping that the JVM doesn't
+ * reorder them.
+ *
+ * JVM intrinsics note: It would be possible to use a release-only
+ * form of CAS here, if it were provided.
+ */
+ static final class Cell {
+ volatile long p0, p1, p2, p3, p4, p5, p6;
+ volatile long value;
+ volatile long q0, q1, q2, q3, q4, q5, q6;
+ Cell(long x) { value = x; }
+
+ final boolean cas(long cmp, long val) {
+ return UNSAFE.compareAndSwapLong(this, valueOffset, cmp, val);
+ }
+
+ // Unsafe mechanics
+ private static final sun.misc.Unsafe UNSAFE;
+ private static final long valueOffset;
+ static {
+ try {
+ UNSAFE = sun.misc.Unsafe.getUnsafe();
+ Class<?> ak = Cell.class;
+ valueOffset = UNSAFE.objectFieldOffset
+ (ak.getDeclaredField("value"));
+ } catch (Exception e) {
+ throw new Error(e);
+ }
+ }
+ }
+
+ /** Number of CPUS, to place bound on table size */
+ static final int NCPU = Runtime.getRuntime().availableProcessors();
+
+ /**
+ * Table of cells. When non-null, size is a power of 2.
+ */
+ transient volatile Cell[] cells;
+
+ /**
+ * Base value, used mainly when there is no contention, but also as
+ * a fallback during table initialization races. Updated via CAS.
+ */
+ transient volatile long base;
+
+ /**
+ * Spinlock (locked via CAS) used when resizing and/or creating Cells.
+ */
+ transient volatile int cellsBusy;
+
+ /**
+ * Package-private default constructor
+ */
+ Striped64() {
+ }
+
+ /**
+ * CASes the base field.
+ */
+ final boolean casBase(long cmp, long val) {
+ return UNSAFE.compareAndSwapLong(this, BASE, cmp, val);
+ }
+
+ /**
+ * CASes the cellsBusy field from 0 to 1 to acquire lock.
+ */
+ final boolean casCellsBusy() {
+ return UNSAFE.compareAndSwapInt(this, CELLSBUSY, 0, 1);
+ }
+
+ /**
+ * Returns the probe value for the current thread.
+ * Duplicated from ThreadLocalRandom because of packaging restrictions.
+ */
+ static final int getProbe() {
+ return UNSAFE.getInt(Thread.currentThread(), PROBE);
+ }
+
+ /**
+ * Pseudo-randomly advances and records the given probe value for the
+ * given thread.
+ * Duplicated from ThreadLocalRandom because of packaging restrictions.
+ */
+ static final int advanceProbe(int probe) {
+ probe ^= probe << 13; // xorshift
+ probe ^= probe >>> 17;
+ probe ^= probe << 5;
+ UNSAFE.putInt(Thread.currentThread(), PROBE, probe);
+ return probe;
+ }
+
+ /**
+ * Handles cases of updates involving initialization, resizing,
+ * creating new Cells, and/or contention. See above for
+ * explanation. This method suffers the usual non-modularity
+ * problems of optimistic retry code, relying on rechecked sets of
+ * reads.
+ *
+ * @param x the value
+ * @param fn the update function, or null for add (this convention
+ * avoids the need for an extra field or function in LongAdder).
+ * @param wasUncontended false if CAS failed before call
+ */
+ final void longAccumulate(long x, LongBinaryOperator fn,
+ boolean wasUncontended) {
+ int h;
+ if ((h = getProbe()) == 0) {
+ ThreadLocalRandom.current(); // force initialization
+ h = getProbe();
+ wasUncontended = true;
+ }
+ boolean collide = false; // True if last slot nonempty
+ for (;;) {
+ Cell[] as; Cell a; int n; long v;
+ if ((as = cells) != null && (n = as.length) > 0) {
+ if ((a = as[(n - 1) & h]) == null) {
+ if (cellsBusy == 0) { // Try to attach new Cell
+ Cell r = new Cell(x); // Optimistically create
+ if (cellsBusy == 0 && casCellsBusy()) {
+ boolean created = false;
+ try { // Recheck under lock
+ Cell[] rs; int m, j;
+ if ((rs = cells) != null &&
+ (m = rs.length) > 0 &&
+ rs[j = (m - 1) & h] == null) {
+ rs[j] = r;
+ created = true;
+ }
+ } finally {
+ cellsBusy = 0;
+ }
+ if (created)
+ break;
+ continue; // Slot is now non-empty
+ }
+ }
+ collide = false;
+ }
+ else if (!wasUncontended) // CAS already known to fail
+ wasUncontended = true; // Continue after rehash
+ else if (a.cas(v = a.value, ((fn == null) ? v + x :
+ fn.operateAsLong(v, x))))
+ break;
+ else if (n >= NCPU || cells != as)
+ collide = false; // At max size or stale
+ else if (!collide)
+ collide = true;
+ else if (cellsBusy == 0 && casCellsBusy()) {
+ try {
+ if (cells == as) { // Expand table unless stale
+ Cell[] rs = new Cell[n << 1];
+ for (int i = 0; i < n; ++i)
+ rs[i] = as[i];
+ cells = rs;
+ }
+ } finally {
+ cellsBusy = 0;
+ }
+ collide = false;
+ continue; // Retry with expanded table
+ }
+ h = advanceProbe(h);
+ }
+ else if (cellsBusy == 0 && cells == as && casCellsBusy()) {
+ boolean init = false;
+ try { // Initialize table
+ if (cells == as) {
+ Cell[] rs = new Cell[2];
+ rs[h & 1] = new Cell(x);
+ cells = rs;
+ init = true;
+ }
+ } finally {
+ cellsBusy = 0;
+ }
+ if (init)
+ break;
+ }
+ else if (casBase(v = base, ((fn == null) ? v + x :
+ fn.operateAsLong(v, x))))
+ break; // Fall back on using base
+ }
+ }
+
+ /**
+ * Same as longAccumulate, but injecting long/double conversions
+ * in too many places to sensibly merge with long version, given
+ * the low-overhead requirements of this class. So must instead be
+ * maintained by copy/paste/adapt.
+ */
+ final void doubleAccumulate(double x, DoubleBinaryOperator fn,
+ boolean wasUncontended) {
+ int h;
+ if ((h = getProbe()) == 0) {
+ ThreadLocalRandom.current(); // force initialization
+ h = getProbe();
+ wasUncontended = true;
+ }
+ boolean collide = false; // True if last slot nonempty
+ for (;;) {
+ Cell[] as; Cell a; int n; long v;
+ if ((as = cells) != null && (n = as.length) > 0) {
+ if ((a = as[(n - 1) & h]) == null) {
+ if (cellsBusy == 0) { // Try to attach new Cell
+ Cell r = new Cell(Double.doubleToRawLongBits(x));
+ if (cellsBusy == 0 && casCellsBusy()) {
+ boolean created = false;
+ try { // Recheck under lock
+ Cell[] rs; int m, j;
+ if ((rs = cells) != null &&
+ (m = rs.length) > 0 &&
+ rs[j = (m - 1) & h] == null) {
+ rs[j] = r;
+ created = true;
+ }
+ } finally {
+ cellsBusy = 0;
+ }
+ if (created)
+ break;
+ continue; // Slot is now non-empty
+ }
+ }
+ collide = false;
+ }
+ else if (!wasUncontended) // CAS already known to fail
+ wasUncontended = true; // Continue after rehash
+ else if (a.cas(v = a.value,
+ ((fn == null) ?
+ Double.doubleToRawLongBits
+ (Double.longBitsToDouble(v) + x) :
+ Double.doubleToRawLongBits
+ (fn.operateAsDouble
+ (Double.longBitsToDouble(v), x)))))
+ break;
+ else if (n >= NCPU || cells != as)
+ collide = false; // At max size or stale
+ else if (!collide)
+ collide = true;
+ else if (cellsBusy == 0 && casCellsBusy()) {
+ try {
+ if (cells == as) { // Expand table unless stale
+ Cell[] rs = new Cell[n << 1];
+ for (int i = 0; i < n; ++i)
+ rs[i] = as[i];
+ cells = rs;
+ }
+ } finally {
+ cellsBusy = 0;
+ }
+ collide = false;
+ continue; // Retry with expanded table
+ }
+ h = advanceProbe(h);
+ }
+ else if (cellsBusy == 0 && cells == as && casCellsBusy()) {
+ boolean init = false;
+ try { // Initialize table
+ if (cells == as) {
+ Cell[] rs = new Cell[2];
+ rs[h & 1] = new Cell(Double.doubleToRawLongBits(x));
+ cells = rs;
+ init = true;
+ }
+ } finally {
+ cellsBusy = 0;
+ }
+ if (init)
+ break;
+ }
+ else if (casBase(v = base,
+ ((fn == null) ?
+ Double.doubleToRawLongBits
+ (Double.longBitsToDouble(v) + x) :
+ Double.doubleToRawLongBits
+ (fn.operateAsDouble
+ (Double.longBitsToDouble(v), x)))))
+ break; // Fall back on using base
+ }
+ }
+
+ // Unsafe mechanics
+ private static final sun.misc.Unsafe UNSAFE;
+ private static final long BASE;
+ private static final long CELLSBUSY;
+ private static final long PROBE;
+ static {
+ try {
+ UNSAFE = sun.misc.Unsafe.getUnsafe();
+ Class<?> sk = Striped64.class;
+ BASE = UNSAFE.objectFieldOffset
+ (sk.getDeclaredField("base"));
+ CELLSBUSY = UNSAFE.objectFieldOffset
+ (sk.getDeclaredField("cellsBusy"));
+ Class<?> tk = Thread.class;
+ PROBE = UNSAFE.objectFieldOffset
+ (tk.getDeclaredField("threadLocalRandomProbe"));
+ } catch (Exception e) {
+ throw new Error(e);
+ }
+ }
+
+}
--- a/jdk/src/share/classes/java/util/spi/CalendarNameProvider.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/java/util/spi/CalendarNameProvider.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -134,6 +134,26 @@
* specified. See also the <a href="../../text/SimpleDateFormat.html#year">
* Year representation in {@code SimpleDateFormat}</a>.</td>
* </tr>
+ * <tr>
+ * <td rowspan="2" valign="top">{@code "roc"}</td>
+ * <td rowspan="2" valign="top">{@link Calendar#ERA}</td>
+ * <td>0</td>
+ * <td>Before R.O.C.</td>
+ * </tr>
+ * <tr>
+ * <td>1</td>
+ * <td>R.O.C.</td>
+ * </tr>
+ * <tr>
+ * <td rowspan="2" valign="top">{@code "islamic"}</td>
+ * <td rowspan="2" valign="top">{@link Calendar#ERA}</td>
+ * <td>0</td>
+ * <td>Before AH</td>
+ * </tr>
+ * <tr>
+ * <td>1</td>
+ * <td>Anno Hijrah (AH)</td>
+ * </tr>
* </table>
*
* <p>Calendar field value names for {@code "gregory"} must be consistent with
--- a/jdk/src/share/classes/sun/text/resources/FormatData.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/FormatData.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources;
import java.util.ListResourceBundle;
@@ -762,6 +798,14 @@
"H:mm", // short time pattern
}
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yyyy-MM-dd",
+ }
+ },
{ "buddhist.DatePatterns",
new String[] {
"EEEE d MMMM G yyyy", // full date pattern
@@ -783,6 +827,14 @@
"h:mm a", // short time pattern
}
},
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yy-MM-dd",
+ }
+ },
{ "japanese.DatePatterns",
new String[] {
"GGGG yyyy MMMM d (EEEE)", // full date pattern
@@ -796,7 +848,103 @@
"{1} {0}" // date-time pattern
}
},
+ { "roc.Eras",
+ new String[] {
+ "Before R.O.C.",
+ "R.O.C.",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yyy-MM-dd",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, GGGG y MMMM dd",
+ "GGGG y MMMM d",
+ "GGGG y MMM d",
+ "G yyy-MM-dd",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "Muharram",
+ "Safar",
+ "Rabi\u02bb I",
+ "Rabi\u02bb II",
+ "Jumada I",
+ "Jumada II",
+ "Rajab",
+ "Sha\u02bbban",
+ "Ramadan",
+ "Shawwal",
+ "Dhu\u02bbl-Qi\u02bbdah",
+ "Dhu\u02bbl-Hijjah",
+ "",
+ }
+ },
+ { "islamic.MonthAbbreviations",
+ new String[] {
+ "Muh.",
+ "Saf.",
+ "Rab. I",
+ "Rab. II",
+ "Jum. I",
+ "Jum. II",
+ "Raj.",
+ "Sha.",
+ "Ram.",
+ "Shaw.",
+ "Dhu\u02bbl-Q.",
+ "Dhu\u02bbl-H.",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "AH",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, MMMM d, y GGGG",
+ "MMMM d, y GGGG",
+ "MMM d, y GGGG",
+ "M/d/yy GGGG",
+ }
+ },
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "calendarname.islamic-civil", "Islamic-Civil Calendar" },
+ { "calendarname.islamicc", "Islamic-Civil Calendar" },
+ { "calendarname.islamic", "Islamic Calendar" },
+ { "calendarname.japanese", "Japanese Calendar" },
+ { "calendarname.gregorian", "Gregorian Calendar" },
+ { "calendarname.gregory", "Gregorian Calendar" },
+ { "calendarname.roc", "Minguo Calendar" },
+ { "calendarname.buddhist", "Buddhist Calendar" },
+ { "field.era", "Era" },
+ { "field.year", "Year" },
+ { "field.month", "Month" },
+ { "field.week", "Week" },
+ { "field.weekday", "Day of the Week" },
+ { "field.dayperiod", "Dayperiod" },
+ { "field.hour", "Hour" },
+ { "field.minute", "Minute" },
+ { "field.second", "Second" },
+ { "field.zone", "Zone" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ar/FormatData_ar.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.ar;
import java.util.ListResourceBundle;
@@ -159,6 +195,118 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE\u060c d MMMM\u060c y G",
+ "d MMMM\u060c y G",
+ "dd\u200f/MM\u200f/y G",
+ "d\u200f/M\u200f/y G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE\u060c d MMMM\u060c y G",
+ "d MMMM\u060c y G",
+ "dd\u200f/MM\u200f/y G",
+ "d\u200f/M\u200f/y G",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "Before R.O.C.",
+ "\u062c\u0645\u0647\u0648\u0631\u064a\u0629 \u0627\u0644\u0635\u064a",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE\u060c d MMMM\u060c y G",
+ "d MMMM\u060c y G",
+ "dd\u200f/MM\u200f/y G",
+ "d\u200f/M\u200f/y G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE\u060c d MMMM\u060c y GGGG",
+ "d MMMM\u060c y GGGG",
+ "dd\u200f/MM\u200f/y GGGG",
+ "d\u200f/M\u200f/y GGGG",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u0645\u062d\u0631\u0645",
+ "\u0635\u0641\u0631",
+ "\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644",
+ "\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631",
+ "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649",
+ "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629",
+ "\u0631\u062c\u0628",
+ "\u0634\u0639\u0628\u0627\u0646",
+ "\u0631\u0645\u0636\u0627\u0646",
+ "\u0634\u0648\u0627\u0644",
+ "\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629",
+ "\u0630\u0648 \u0627\u0644\u062d\u062c\u0629",
+ "",
+ }
+ },
+ { "islamic.MonthAbbreviations",
+ new String[] {
+ "\u0645\u062d\u0631\u0645",
+ "\u0635\u0641\u0631",
+ "\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644",
+ "\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631",
+ "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649",
+ "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629",
+ "\u0631\u062c\u0628",
+ "\u0634\u0639\u0628\u0627\u0646",
+ "\u0631\u0645\u0636\u0627\u0646",
+ "\u0634\u0648\u0627\u0644",
+ "\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629",
+ "\u0630\u0648 \u0627\u0644\u062d\u062c\u0629",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "\u0647\u0640",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE\u060c d MMMM y",
+ "d MMMM y",
+ "d MMM\u060c y G",
+ "d\u200f/M\u200f/yyyy",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE\u060c d MMMM y",
+ "d MMMM y",
+ "d MMM\u060c y GGGG",
+ "d\u200f/M\u200f/yyyy",
+ }
+ },
+ { "calendarname.islamic-civil", "\u062a\u0642\u0648\u064a\u0645 \u0627\u0633\u0644\u0627\u0645\u064a \u0645\u062f\u0646\u064a" },
+ { "calendarname.islamicc", "\u062a\u0642\u0648\u064a\u0645 \u0627\u0633\u0644\u0627\u0645\u064a \u0645\u062f\u0646\u064a" },
+ { "calendarname.islamic", "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0647\u062c\u0631\u064a" },
+ { "calendarname.japanese", "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u064a\u0627\u0628\u0627\u0646\u064a" },
+ { "calendarname.gregorian", "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0645\u064a\u0644\u0627\u062f\u064a" },
+ { "calendarname.gregory", "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0645\u064a\u0644\u0627\u062f\u064a" },
+ { "calendarname.roc", "\u062a\u0642\u0648\u064a\u0645 \u0645\u064a\u0646\u062c\u0648" },
+ { "calendarname.buddhist", "\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a" },
+ { "field.era", "\u0627\u0644\u0639\u0635\u0631" },
+ { "field.year", "\u0627\u0644\u0633\u0646\u0629" },
+ { "field.month", "\u0627\u0644\u0634\u0647\u0631" },
+ { "field.week", "\u0627\u0644\u0623\u0633\u0628\u0648\u0639" },
+ { "field.weekday", "\u0627\u0644\u064a\u0648\u0645" },
+ { "field.dayperiod", "\u0635/\u0645" },
+ { "field.hour", "\u0627\u0644\u0633\u0627\u0639\u0627\u062a" },
+ { "field.minute", "\u0627\u0644\u062f\u0642\u0627\u0626\u0642" },
+ { "field.second", "\u0627\u0644\u062b\u0648\u0627\u0646\u064a" },
+ { "field.zone", "\u0627\u0644\u062a\u0648\u0642\u064a\u062a" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/be/FormatData_be.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/be/FormatData_be.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.be;
import java.util.ListResourceBundle;
@@ -178,6 +214,29 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "d.M.yy",
+ }
+ },
+ { "calendarname.islamic-civil", "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamicc", "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamic", "\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "calendarname.buddhist", "\u0431\u0443\u0434\u044b\u0441\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "calendarname.japanese", "\u044f\u043f\u043e\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregorian", "\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregory", "\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440" },
+ { "field.era", "\u044d\u0440\u0430" },
+ { "field.year", "\u0433\u043e\u0434" },
+ { "field.month", "\u043c\u0435\u0441\u044f\u0446" },
+ { "field.week", "\u0442\u044b\u0434\u0437\u0435\u043d\u044c" },
+ { "field.weekday", "\u0434\u0437\u0435\u043d\u044c \u0442\u044b\u0434\u043d\u044f" },
+ { "field.hour", "\u0433\u0430\u0434\u0437\u0456\u043d\u0430" },
+ { "field.minute", "\u0445\u0432\u0456\u043b\u0456\u043d\u0430" },
+ { "field.second", "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/bg/FormatData_bg.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/bg/FormatData_bg.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.bg;
import java.util.ListResourceBundle;
@@ -161,6 +197,41 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u043c\u0443\u0445\u0430\u0440\u0430\u043c",
+ "\u0441\u0430\u0444\u0430\u0440",
+ "\u0440\u0430\u0431\u0438-1",
+ "\u0440\u0430\u0431\u0438-2",
+ "\u0434\u0436\u0443\u043c\u0430\u0434\u0430-1",
+ "\u0434\u0436\u0443\u043c\u0430\u0434\u0430-2",
+ "\u0440\u0430\u0434\u0436\u0430\u0431",
+ "\u0448\u0430\u0431\u0430\u043d",
+ "\u0440\u0430\u043c\u0430\u0437\u0430\u043d",
+ "\u0428\u0430\u0432\u0430\u043b",
+ "\u0414\u0445\u0443\u043b-\u041a\u0430\u0430\u0434\u0430",
+ "\u0414\u0445\u0443\u043b-\u0445\u0438\u0434\u0436\u0430",
+ "",
+ }
+ },
+ { "calendarname.islamic-civil", "\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamicc", "\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamic", "\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.japanese", "\u042f\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregorian", "\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregory", "\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.roc", "\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u0442\u0430\u0439" },
+ { "calendarname.buddhist", "\u0411\u0443\u0434\u0438\u0441\u0442\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "field.era", "\u0435\u0440\u0430" },
+ { "field.year", "\u0433\u043e\u0434\u0438\u043d\u0430" },
+ { "field.month", "\u043c\u0435\u0441\u0435\u0446" },
+ { "field.week", "\u0441\u0435\u0434\u043c\u0438\u0446\u0430" },
+ { "field.weekday", "\u0414\u0435\u043d \u043e\u0442 \u0441\u0435\u0434\u043c\u0438\u0446\u0430\u0442\u0430" },
+ { "field.dayperiod", "\u0434\u0435\u043d" },
+ { "field.hour", "\u0447\u0430\u0441" },
+ { "field.minute", "\u043c\u0438\u043d\u0443\u0442\u0430" },
+ { "field.second", "\u0441\u0435\u043a\u0443\u043d\u0434\u0430" },
+ { "field.zone", "\u0437\u043e\u043d\u0430" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ca/FormatData_ca.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ca/FormatData_ca.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.ca;
import java.util.ListResourceBundle;
@@ -217,6 +253,24 @@
}
},
{ "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" },
+ { "calendarname.islamic-civil", "calendari civil isl\u00e0mic" },
+ { "calendarname.islamicc", "calendari civil isl\u00e0mic" },
+ { "calendarname.roc", "calendari de la Rep\u00fablica de Xina" },
+ { "calendarname.islamic", "calendari musulm\u00e0" },
+ { "calendarname.buddhist", "calendari budista" },
+ { "calendarname.japanese", "calendari japon\u00e8s" },
+ { "calendarname.gregorian", "calendari gregori\u00e0" },
+ { "calendarname.gregory", "calendari gregori\u00e0" },
+ { "field.era", "era" },
+ { "field.year", "any" },
+ { "field.month", "mes" },
+ { "field.week", "setmana" },
+ { "field.weekday", "dia de la setmana" },
+ { "field.dayperiod", "a.m./p.m." },
+ { "field.hour", "hora" },
+ { "field.minute", "minut" },
+ { "field.second", "segon" },
+ { "field.zone", "zona" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/cs/FormatData_cs.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/cs/FormatData_cs.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.cs;
import java.util.ListResourceBundle;
@@ -201,6 +237,22 @@
}
},
{ "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" },
+ { "calendarname.islamic-civil", "Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159" },
+ { "calendarname.islamicc", "Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159" },
+ { "calendarname.islamic", "Muslimsk\u00fd kalend\u00e1\u0159" },
+ { "calendarname.buddhist", "Buddhistick\u00fd kalend\u00e1\u0159" },
+ { "calendarname.japanese", "Japonsk\u00fd kalend\u00e1\u0159" },
+ { "calendarname.gregorian", "Gregori\u00e1nsk\u00fd kalend\u00e1\u0159" },
+ { "calendarname.gregory", "Gregori\u00e1nsk\u00fd kalend\u00e1\u0159" },
+ { "field.year", "Rok" },
+ { "field.month", "M\u011bs\u00edc" },
+ { "field.week", "T\u00fdden" },
+ { "field.weekday", "Den v t\u00fddnu" },
+ { "field.dayperiod", "AM/PM" },
+ { "field.hour", "Hodina" },
+ { "field.minute", "Minuta" },
+ { "field.second", "Sekunda" },
+ { "field.zone", "\u010casov\u00e9 p\u00e1smo" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/da/FormatData_da.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/da/FormatData_da.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.da;
import java.util.ListResourceBundle;
@@ -172,6 +208,64 @@
}
},
{ "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d/M/y GGGGG",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d/M/y GGGGG",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y GGGG",
+ "d. MMMM y GGGG",
+ "d. MMM y GGGG",
+ "d/M/y G",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d/M/y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y GGGG",
+ "d. MMMM y GGGG",
+ "d. MMM y GGGG",
+ "d/M/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "verdslig islamisk kalender" },
+ { "calendarname.islamicc", "verdslig islamisk kalender" },
+ { "calendarname.roc", "kalender for Republikken Kina" },
+ { "calendarname.islamic", "islamisk kalender" },
+ { "calendarname.buddhist", "buddhistisk kalender" },
+ { "calendarname.japanese", "japansk kalender" },
+ { "calendarname.gregorian", "gregoriansk kalender" },
+ { "calendarname.gregory", "gregoriansk kalender" },
+ { "field.era", "\u00e6ra" },
+ { "field.year", "\u00e5r" },
+ { "field.month", "m\u00e5ned" },
+ { "field.week", "uge" },
+ { "field.weekday", "ugedag" },
+ { "field.dayperiod", "dagtid" },
+ { "field.hour", "time" },
+ { "field.minute", "minut" },
+ { "field.second", "sekund" },
+ { "field.zone", "tidszone" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/de/FormatData_de.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/de/FormatData_de.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.de;
import java.util.ListResourceBundle;
@@ -178,6 +214,72 @@
}
},
{ "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d.M.yyyy",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d.M.y GGGGG",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d.M.y GGGGG",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y GGGG",
+ "d. MMMM y GGGG",
+ "d. MMM y GGGG",
+ "d.M.y G",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d.M.y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y GGGG",
+ "d. MMMM y GGGG",
+ "d. MMM y GGGG",
+ "d.M.y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "B\u00fcrgerlicher islamischer Kalender" },
+ { "calendarname.islamicc", "B\u00fcrgerlicher islamischer Kalender" },
+ { "calendarname.roc", "Kalender der Republik China" },
+ { "calendarname.islamic", "Islamischer Kalender" },
+ { "calendarname.buddhist", "Buddhistischer Kalender" },
+ { "calendarname.japanese", "Japanischer Kalender" },
+ { "calendarname.gregorian", "Gregorianischer Kalender" },
+ { "calendarname.gregory", "Gregorianischer Kalender" },
+ { "field.era", "Epoche" },
+ { "field.year", "Jahr" },
+ { "field.month", "Monat" },
+ { "field.week", "Woche" },
+ { "field.weekday", "Wochentag" },
+ { "field.dayperiod", "Tagesh\u00e4lfte" },
+ { "field.hour", "Stunde" },
+ { "field.minute", "Minute" },
+ { "field.second", "Sekunde" },
+ { "field.zone", "Zone" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/el/FormatData_el.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/el/FormatData_el.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,6 +41,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.el;
import java.util.ListResourceBundle;
@@ -178,6 +214,62 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/yyyy",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/yy",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "\u03a0\u03c1\u03b9\u03bd R.O.C.",
+ "R.O.C.",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM, y G",
+ "d/M/y G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y GGGG",
+ "d MMMM, y GGGG",
+ "d MMM, y GGGG",
+ "d/M/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "calendarname.islamicc", "\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "calendarname.islamic", "\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "calendarname.japanese", "\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "calendarname.gregorian", "\u0393\u03c1\u03b7\u03b3\u03bf\u03c1\u03b9\u03b1\u03bd\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "calendarname.gregory", "\u0393\u03c1\u03b7\u03b3\u03bf\u03c1\u03b9\u03b1\u03bd\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "calendarname.roc", "\u0397\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf \u03c4\u03b7\u03c2 \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1\u03c2 \u03c4\u03b7\u03c2 \u039a\u03af\u03bd\u03b1\u03c2" },
+ { "calendarname.buddhist", "\u0392\u03bf\u03c5\u03b4\u03b9\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf" },
+ { "field.era", "\u03a0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2" },
+ { "field.year", "\u0388\u03c4\u03bf\u03c2" },
+ { "field.month", "\u039c\u03ae\u03bd\u03b1\u03c2" },
+ { "field.week", "\u0395\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1" },
+ { "field.weekday", "\u0397\u03bc\u03ad\u03c1\u03b1 \u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1\u03c2" },
+ { "field.dayperiod", "\u03c0.\u03bc./\u03bc.\u03bc." },
+ { "field.hour", "\u038f\u03c1\u03b1" },
+ { "field.minute", "\u039b\u03b5\u03c0\u03c4\u03cc" },
+ { "field.second", "\u0394\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf" },
+ { "field.zone", "\u0396\u03ce\u03bd\u03b7" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/es/FormatData_es.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/es/FormatData_es.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.es;
import java.util.ListResourceBundle;
@@ -159,6 +195,72 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/y G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/y GGGGG",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/y GGGGG",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y GGGG",
+ "d 'de' MMMM 'de' y GGGG",
+ "dd/MM/y GGGG",
+ "dd/MM/y G",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/y G",
+ "dd/MM/y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y GGGG",
+ "d 'de' MMMM 'de' y GGGG",
+ "dd/MM/y GGGG",
+ "dd/MM/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "calendario civil isl\u00e1mico" },
+ { "calendarname.islamicc", "calendario civil isl\u00e1mico" },
+ { "calendarname.islamic", "calendario isl\u00e1mico" },
+ { "calendarname.japanese", "calendario japon\u00e9s" },
+ { "calendarname.gregorian", "calendario gregoriano" },
+ { "calendarname.gregory", "calendario gregoriano" },
+ { "calendarname.roc", "calendario de la Rep\u00fablica de China" },
+ { "calendarname.buddhist", "calendario budista" },
+ { "field.era", "era" },
+ { "field.year", "a\u00f1o" },
+ { "field.month", "mes" },
+ { "field.week", "semana" },
+ { "field.weekday", "d\u00eda de la semana" },
+ { "field.dayperiod", "periodo del d\u00eda" },
+ { "field.hour", "hora" },
+ { "field.minute", "minuto" },
+ { "field.second", "segundo" },
+ { "field.zone", "zona" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/et/FormatData_et.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/et/FormatData_et.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.et;
import java.util.ListResourceBundle;
@@ -158,6 +194,24 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "calendarname.islamic-civil", "islami ilmalik kalender" },
+ { "calendarname.islamicc", "islami ilmalik kalender" },
+ { "calendarname.roc", "Hiina Vabariigi kalender" },
+ { "calendarname.islamic", "islamikalender" },
+ { "calendarname.buddhist", "budistlik kalender" },
+ { "calendarname.japanese", "Jaapani kalender" },
+ { "calendarname.gregorian", "Gregoriuse kalender" },
+ { "calendarname.gregory", "Gregoriuse kalender" },
+ { "field.era", "ajastu" },
+ { "field.year", "aasta" },
+ { "field.month", "kuu" },
+ { "field.week", "n\u00e4dal" },
+ { "field.weekday", "n\u00e4dalap\u00e4ev" },
+ { "field.dayperiod", "enne/p\u00e4rast l\u00f5unat" },
+ { "field.hour", "tund" },
+ { "field.minute", "minut" },
+ { "field.second", "sekund" },
+ { "field.zone", "v\u00f6\u00f6nd" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/fi/FormatData_fi.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/fi/FormatData_fi.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.fi;
import java.util.ListResourceBundle;
@@ -200,6 +236,14 @@
"H:mm", // short time pattern
}
},
+ { "cldr.DatePatterns",
+ new String[] {
+ "cccc, d. MMMM y",
+ "d. MMMM y",
+ "d.M.yyyy",
+ "d.M.yyyy",
+ }
+ },
{ "DatePatterns",
new String[] {
"d. MMMM'ta 'yyyy", // full date pattern
@@ -226,6 +270,89 @@
"ip.",
}
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "cccc d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "cccc d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "cccc d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y GGGG",
+ "d. MMMM y GGGG",
+ "d.M.y GGGG",
+ "d.M.y GGGG",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "muharram",
+ "safar",
+ "rabi\u2019 al-awwal",
+ "rabi\u2019 al-akhir",
+ "d\u017eumada-l-ula",
+ "d\u017eumada-l-akhira",
+ "rad\u017eab",
+ "\u0161a\u2019ban",
+ "ramadan",
+ "\u0161awwal",
+ "dhu-l-qa\u2019da",
+ "dhu-l-hidd\u017ea",
+ "",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "cccc d. MMMM y G",
+ "d. MMMM y G",
+ "d.M.y G",
+ "d.M.y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d. MMMM y GGGG",
+ "d. MMMM y GGGG",
+ "d.M.y GGGG",
+ "d.M.y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "islamilainen siviilikalenteri" },
+ { "calendarname.islamicc", "islamilainen siviilikalenteri" },
+ { "calendarname.islamic", "islamilainen kalenteri" },
+ { "calendarname.japanese", "japanilainen kalenteri" },
+ { "calendarname.gregorian", "gregoriaaninen kalenteri" },
+ { "calendarname.gregory", "gregoriaaninen kalenteri" },
+ { "calendarname.roc", "Kiinan tasavallan kalenteri" },
+ { "calendarname.buddhist", "buddhalainen kalenteri" },
+ { "field.era", "aikakausi" },
+ { "field.year", "vuosi" },
+ { "field.month", "kuukausi" },
+ { "field.week", "viikko" },
+ { "field.weekday", "viikonp\u00e4iv\u00e4" },
+ { "field.dayperiod", "vuorokaudenaika" },
+ { "field.hour", "tunti" },
+ { "field.minute", "minuutti" },
+ { "field.second", "sekunti" },
+ { "field.zone", "aikavy\u00f6hyke" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/fr/FormatData_fr.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.fr;
import java.util.ListResourceBundle;
@@ -165,6 +201,112 @@
}
},
{ "DateTimePatternChars", "GaMjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/yyyy",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y GGGGG",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "d MMM, y GGGG",
+ "d/M/y G",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "Mouharram",
+ "Safar",
+ "Rabi\u02bb-oul-Aououal",
+ "Rabi\u02bb-out-Tani",
+ "Djoumada-l-Oula",
+ "Djoumada-t-Tania",
+ "Radjab",
+ "Cha\u02bbban",
+ "Ramadan",
+ "Chaououal",
+ "Dou-l-Qa\u02bbda",
+ "Dou-l-Hidjja",
+ "",
+ }
+ },
+ { "islamic.MonthAbbreviations",
+ new String[] {
+ "Mouh.",
+ "Saf.",
+ "Rabi\u02bb-oul-A.",
+ "Rabi\u02bb-out-T.",
+ "Djoum.-l-O.",
+ "Djoum.-t-T.",
+ "Radj.",
+ "Cha.",
+ "Ram.",
+ "Chaou.",
+ "Dou-l-Q.",
+ "Dou-l-H.",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "AH",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM, y G",
+ "d/M/y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "d MMM, y GGGG",
+ "d/M/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "Calendrier civil musulman" },
+ { "calendarname.islamicc", "Calendrier civil musulman" },
+ { "calendarname.islamic", "Calendrier musulman" },
+ { "calendarname.japanese", "Calendrier japonais" },
+ { "calendarname.gregorian", "Calendrier gr\u00e9gorien" },
+ { "calendarname.gregory", "Calendrier gr\u00e9gorien" },
+ { "calendarname.roc", "Calendrier r\u00e9publicain chinois" },
+ { "calendarname.buddhist", "Calendrier bouddhiste" },
+ { "field.era", "\u00e8re" },
+ { "field.year", "ann\u00e9e" },
+ { "field.month", "mois" },
+ { "field.week", "semaine" },
+ { "field.weekday", "jour de la semaine" },
+ { "field.dayperiod", "cadran" },
+ { "field.hour", "heure" },
+ { "field.minute", "minute" },
+ { "field.second", "seconde" },
+ { "field.zone", "fuseau horaire" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/hi/FormatData_hi_IN.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/hi/FormatData_hi_IN.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.hi;
import java.util.ListResourceBundle;
@@ -159,6 +195,24 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "calendarname.islamic-civil", "\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u0928\u093e\u0917\u0930\u093f\u0915 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.islamicc", "\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u0928\u093e\u0917\u0930\u093f\u0915 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.roc", "\u091a\u0940\u0928\u0940 \u0917\u0923\u0924\u0902\u0924\u094d\u0930 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.islamic", "\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.buddhist", "\u092c\u094c\u0926\u094d\u0927 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.japanese", "\u091c\u093e\u092a\u093e\u0928\u0940 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.gregorian", "\u0917\u094d\u0930\u0947\u0917\u0930\u0940 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "calendarname.gregory", "\u0917\u094d\u0930\u0947\u0917\u0930\u0940 \u092a\u0902\u091a\u093e\u0902\u0917" },
+ { "field.era", "\u092f\u0941\u0917" },
+ { "field.year", "\u0935\u0930\u094d\u0937" },
+ { "field.month", "\u092e\u093e\u0938" },
+ { "field.week", "\u0938\u092a\u094d\u0924\u093e\u0939" },
+ { "field.weekday", "\u0938\u092a\u094d\u0924\u093e\u0939 \u0915\u093e \u0926\u093f\u0928" },
+ { "field.dayperiod", "\u0938\u092e\u092f \u0905\u0935\u0927\u093f" },
+ { "field.hour", "\u0918\u0902\u091f\u093e" },
+ { "field.minute", "\u092e\u093f\u0928\u091f" },
+ { "field.second", "\u0938\u0947\u0915\u0947\u0902\u0921" },
+ { "field.zone", "\u0915\u094d\u0937\u0947\u0924\u094d\u0930" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/hr/FormatData_hr.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/hr/FormatData_hr.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.hr;
import java.util.ListResourceBundle;
@@ -214,6 +250,62 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, d. MMMM y. G",
+ "d. MMMM y. G",
+ "d. M. y. G",
+ "d.M.y.",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, d. MMMM y. G",
+ "d. MMMM y. G",
+ "d. M. y. G",
+ "d.M.y. G",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "prije R.O.C.",
+ "R.O.C.",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d. MMMM y. G",
+ "d. MMMM y. G",
+ "d. M. y. G",
+ "d.M.y. G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d. MMMM y. GGGG",
+ "d. MMMM y. GGGG",
+ "d. M. y. GGGG",
+ "d.M.y. GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "islamski civilni kalendar" },
+ { "calendarname.islamicc", "islamski civilni kalendar" },
+ { "calendarname.roc", "kalendar Republike Kine" },
+ { "calendarname.islamic", "islamski kalendar" },
+ { "calendarname.buddhist", "budisti\u010dki kalendar" },
+ { "calendarname.japanese", "japanski kalendar" },
+ { "calendarname.gregorian", "gregorijanski kalendar" },
+ { "calendarname.gregory", "gregorijanski kalendar" },
+ { "field.era", "era" },
+ { "field.year", "godina" },
+ { "field.month", "mjesec" },
+ { "field.week", "tjedan" },
+ { "field.weekday", "dan u tjednu" },
+ { "field.dayperiod", "dio dana" },
+ { "field.hour", "sat" },
+ { "field.minute", "minuta" },
+ { "field.second", "sekunda" },
+ { "field.zone", "zona" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/hu/FormatData_hu.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/hu/FormatData_hu.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.hu;
import java.util.ListResourceBundle;
@@ -164,6 +200,47 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "islamic.MonthNames",
+ new String[] {
+ "Moharrem",
+ "Safar",
+ "R\u00e9bi el avvel",
+ "R\u00e9bi el accher",
+ "Dsem\u00e1di el avvel",
+ "Dsem\u00e1di el accher",
+ "Redseb",
+ "Sab\u00e1n",
+ "Ramad\u00e1n",
+ "Sevv\u00e1l",
+ "Ds\u00fcl kade",
+ "Ds\u00fcl hedse",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "MF",
+ }
+ },
+ { "calendarname.islamic-civil", "iszl\u00e1m civil napt\u00e1r" },
+ { "calendarname.islamicc", "iszl\u00e1m civil napt\u00e1r" },
+ { "calendarname.islamic", "iszl\u00e1m napt\u00e1r" },
+ { "calendarname.japanese", "jap\u00e1n napt\u00e1r" },
+ { "calendarname.gregorian", "Gergely-napt\u00e1r" },
+ { "calendarname.gregory", "Gergely-napt\u00e1r" },
+ { "calendarname.roc", "K\u00ednai k\u00f6zt\u00e1rsas\u00e1gi napt\u00e1r" },
+ { "calendarname.buddhist", "buddhista napt\u00e1r" },
+ { "field.era", "\u00e9ra" },
+ { "field.year", "\u00e9v" },
+ { "field.month", "h\u00f3nap" },
+ { "field.week", "h\u00e9t" },
+ { "field.weekday", "h\u00e9t napja" },
+ { "field.dayperiod", "napszak" },
+ { "field.hour", "\u00f3ra" },
+ { "field.minute", "perc" },
+ { "field.second", "m\u00e1sodperc" },
+ { "field.zone", "z\u00f3na" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/is/FormatData_is.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/is/FormatData_is.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.is;
import java.util.ListResourceBundle;
@@ -180,6 +216,13 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "calendarname.islamic-civil", "\u00cdslamskt borgaradagatal" },
+ { "calendarname.islamicc", "\u00cdslamskt borgaradagatal" },
+ { "calendarname.islamic", "\u00cdslamskt dagatal" },
+ { "calendarname.buddhist", "B\u00fadd\u00edskt dagatal" },
+ { "calendarname.japanese", "Japanskt dagatal" },
+ { "calendarname.gregorian", "Gregor\u00edskt dagatal" },
+ { "calendarname.gregory", "Gregor\u00edskt dagatal" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/it/FormatData_it.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/it/FormatData_it.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.it;
import java.util.ListResourceBundle;
@@ -175,6 +211,71 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "dd MMMM y G",
+ "dd/MMM/y G",
+ "dd/MM/y G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "dd MMMM y G",
+ "dd/MMM/y G",
+ "dd/MM/y G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "dd MMMM y G",
+ "dd/MMM/y G",
+ "dd/MM/y G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "dd MMMM y GGGG",
+ "dd/MMM/y GGGG",
+ "dd/MM/y GGGG",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "dd MMMM y G",
+ "dd/MMM/y G",
+ "dd/MM/y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "dd MMMM y GGGG",
+ "dd/MMM/y GGGG",
+ "dd/MM/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "calendario civile islamico" },
+ { "calendarname.islamicc", "calendario civile islamico" },
+ { "calendarname.islamic", "calendario islamico" },
+ { "calendarname.buddhist", "calendario buddista" },
+ { "calendarname.japanese", "calendario giapponese" },
+ { "calendarname.gregorian", "calendario gregoriano" },
+ { "calendarname.gregory", "calendario gregoriano" },
+ { "field.era", "era" },
+ { "field.year", "anno" },
+ { "field.month", "mese" },
+ { "field.week", "settimana" },
+ { "field.weekday", "giorno della settimana" },
+ { "field.dayperiod", "periodo del giorno" },
+ { "field.hour", "ora" },
+ { "field.minute", "minuto" },
+ { "field.second", "secondo" },
+ { "field.zone", "zona" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/iw/FormatData_iw.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/iw/FormatData_iw.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.iw;
import java.util.ListResourceBundle;
@@ -171,6 +207,46 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u05de\u05d5\u05d7\u05e8\u05dd",
+ "\u05e1\u05e4\u05e8",
+ "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
+ "\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05ea\u05e0\u05d9",
+ "\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc",
+ "\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05ea\u05e0\u05d9",
+ "\u05e8\u05d2\u05f3\u05d0\u05d1",
+ "\u05e9\u05e2\u05d1\u05d0\u05df",
+ "\u05e8\u05d0\u05de\u05d3\u05df",
+ "\u05e9\u05d5\u05d5\u05d0\u05dc",
+ "\u05d6\u05d5 \u05d0\u05dc-QI'DAH",
+ "\u05d6\u05d5 \u05d0\u05dc-\u05d7\u05d9\u05d2\u05f3\u05d4",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4",
+ }
+ },
+ { "calendarname.islamic-civil", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
+ { "calendarname.islamicc", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9" },
+ { "calendarname.islamic", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9" },
+ { "calendarname.buddhist", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d1\u05d5\u05d3\u05d4\u05d9\u05e1\u05d8\u05d9" },
+ { "calendarname.japanese", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d9\u05e4\u05e0\u05d9" },
+ { "calendarname.gregorian", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9" },
+ { "calendarname.gregory", "\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9" },
+ { "field.era", "\u05ea\u05e7\u05d5\u05e4\u05d4" },
+ { "field.year", "\u05e9\u05e0\u05d4" },
+ { "field.month", "\u05d7\u05d5\u05d3\u05e9" },
+ { "field.week", "\u05e9\u05d1\u05d5\u05e2" },
+ { "field.weekday", "\u05d9\u05d5\u05dd \u05d1\u05e9\u05d1\u05d5\u05e2" },
+ { "field.dayperiod", "\u05dc\u05e4\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6" },
+ { "field.hour", "\u05e9\u05e2\u05d4" },
+ { "field.minute", "\u05d3\u05e7\u05d4" },
+ { "field.second", "\u05e9\u05e0\u05d9\u05d9\u05d4" },
+ { "field.zone", "\u05d0\u05d6\u05d5\u05e8" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ja/FormatData_ja.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ja/FormatData_ja.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.ja;
import java.util.ListResourceBundle;
@@ -133,6 +169,14 @@
"\u4ecf\u66a6", // Butsureki
}
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "GGGGy\u5e74M\u6708d\u65e5EEEE",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "Gy/MM/dd",
+ "Gy/MM/dd",
+ }
+ },
{ "japanese.Eras",
new String[] { // era strings for Japanese imperial calendar
"\u897f\u66a6", // Seireki (Gregorian)
@@ -183,6 +227,14 @@
"{1} {0}" // date-time pattern
}
},
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gyy/MM/dd",
+ }
+ },
{ "japanese.DatePatterns",
new String[] {
"GGGGyyyy'\u5e74'M'\u6708'd'\u65e5'", // full date pattern
@@ -205,6 +257,46 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "roc.Eras",
+ new String[] {
+ "\u6c11\u56fd\u524d",
+ "\u6c11\u56fd",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy/MM/dd",
+ "Gy/MM/dd",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "GGGGy\u5e74M\u6708d\u65e5EEEE",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "GGGGy/MM/dd",
+ "GGGGy/MM/dd",
+ }
+ },
+ { "calendarname.islamic-civil", "\u592a\u967d\u30a4\u30b9\u30e9\u30e0\u66a6" },
+ { "calendarname.islamicc", "\u592a\u967d\u30a4\u30b9\u30e9\u30e0\u66a6" },
+ { "calendarname.islamic", "\u30a4\u30b9\u30e9\u30e0\u66a6" },
+ { "calendarname.japanese", "\u548c\u66a6" },
+ { "calendarname.gregorian", "\u897f\u66a6[\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6]" },
+ { "calendarname.gregory", "\u897f\u66a6[\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6]" },
+ { "calendarname.roc", "\u4e2d\u83ef\u6c11\u56fd\u66a6" },
+ { "calendarname.buddhist", "\u30bf\u30a4\u4ecf\u6559\u66a6" },
+ { "field.era", "\u6642\u4ee3" },
+ { "field.year", "\u5e74" },
+ { "field.month", "\u6708" },
+ { "field.week", "\u9031" },
+ { "field.weekday", "\u66dc\u65e5" },
+ { "field.dayperiod", "\u5348\u524d/\u5348\u5f8c" },
+ { "field.hour", "\u6642" },
+ { "field.minute", "\u5206" },
+ { "field.second", "\u79d2" },
+ { "field.zone", "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ko/FormatData_ko.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ko/FormatData_ko.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.ko;
import java.util.ListResourceBundle;
@@ -143,6 +179,62 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "G y\ub144 M\uc6d4 d\uc77c EEEE",
+ "G y\ub144 M\uc6d4 d\uc77c",
+ "G y. M. d",
+ "G y. M. d",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "G y\ub144 M\uc6d4 d\uc77c EEEE",
+ "G y\ub144 M\uc6d4 d\uc77c",
+ "G y. M. d",
+ "G y. M. d",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "\uc911\ud654\ubbfc\uad6d\uc804",
+ "\uc911\ud654\ubbfc\uad6d",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "G y\ub144 M\uc6d4 d\uc77c EEEE",
+ "G y\ub144 M\uc6d4 d\uc77c",
+ "G y. M. d",
+ "G y. M. d",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "GGGG y\ub144 M\uc6d4 d\uc77c EEEE",
+ "GGGG y\ub144 M\uc6d4 d\uc77c",
+ "GGGG y. M. d",
+ "GGGG y. M. d",
+ }
+ },
+ { "calendarname.islamic-civil", "\uc774\uc2ac\ub78c \uc0c1\uc6a9\ub825" },
+ { "calendarname.islamicc", "\uc774\uc2ac\ub78c \uc0c1\uc6a9\ub825" },
+ { "calendarname.islamic", "\uc774\uc2ac\ub78c\ub825" },
+ { "calendarname.japanese", "\uc77c\ubcf8\ub825" },
+ { "calendarname.gregorian", "\ud0dc\uc591\ub825" },
+ { "calendarname.gregory", "\ud0dc\uc591\ub825" },
+ { "calendarname.roc", "\ub300\ub9cc\ub825" },
+ { "calendarname.buddhist", "\ubd88\uad50\ub825" },
+ { "field.era", "\uc5f0\ud638" },
+ { "field.year", "\ub144" },
+ { "field.month", "\uc6d4" },
+ { "field.week", "\uc8fc" },
+ { "field.weekday", "\uc694\uc77c" },
+ { "field.dayperiod", "\uc624\uc804/\uc624\ud6c4" },
+ { "field.hour", "\uc2dc" },
+ { "field.minute", "\ubd84" },
+ { "field.second", "\ucd08" },
+ { "field.zone", "\uc2dc\uac04\ub300" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/lt/FormatData_lt.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/lt/FormatData_lt.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.lt;
import java.util.ListResourceBundle;
@@ -203,6 +239,32 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "y G, MMMM d, EEEE",
+ "G y MMMM d",
+ "G y MMM d",
+ "GGGGG yyyy-MM-dd",
+ }
+ },
+ { "calendarname.islamic-civil", "Pilietinis islamo kalendorius" },
+ { "calendarname.islamicc", "Pilietinis islamo kalendorius" },
+ { "calendarname.islamic", "Islamo kalendorius" },
+ { "calendarname.japanese", "Japon\u0173 kalendorius" },
+ { "calendarname.gregorian", "Grigaliaus kalendorius" },
+ { "calendarname.gregory", "Grigaliaus kalendorius" },
+ { "calendarname.roc", "Kinijos Respublikos kalendorius" },
+ { "calendarname.buddhist", "Budist\u0173 kalendorius" },
+ { "field.era", "era" },
+ { "field.year", "metai" },
+ { "field.month", "m\u0117nuo" },
+ { "field.week", "savait\u0117" },
+ { "field.weekday", "savait\u0117s diena" },
+ { "field.dayperiod", "dienos metas" },
+ { "field.hour", "valanda" },
+ { "field.minute", "minut\u0117" },
+ { "field.second", "sekund\u0117" },
+ { "field.zone", "laiko juosta" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/lv/FormatData_lv.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/lv/FormatData_lv.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.lv;
import java.util.ListResourceBundle;
@@ -175,6 +211,41 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "islamic.MonthNames",
+ new String[] {
+ "muharams",
+ "safars",
+ "1. rab\u012b",
+ "2. rab\u012b",
+ "1. d\u017eum\u0101d\u0101",
+ "2. d\u017eum\u0101d\u0101",
+ "rad\u017eabs",
+ "\u0161abans",
+ "ramad\u0101ns",
+ "\u0161auvals",
+ "du al-kid\u0101",
+ "du al-hid\u017e\u0101",
+ "",
+ }
+ },
+ { "calendarname.islamic-civil", "isl\u0101ma pilso\u0146u kalend\u0101rs" },
+ { "calendarname.islamicc", "isl\u0101ma pilso\u0146u kalend\u0101rs" },
+ { "calendarname.islamic", "isl\u0101ma kalend\u0101rs" },
+ { "calendarname.japanese", "jap\u0101\u0146u kalend\u0101rs" },
+ { "calendarname.gregorian", "Gregora kalend\u0101rs" },
+ { "calendarname.gregory", "Gregora kalend\u0101rs" },
+ { "calendarname.roc", "\u0136\u012bnas Republikas kalend\u0101rs" },
+ { "calendarname.buddhist", "budistu kalend\u0101rs" },
+ { "field.era", "\u0113ra" },
+ { "field.year", "Gads" },
+ { "field.month", "M\u0113nesis" },
+ { "field.week", "Ned\u0113\u013ca" },
+ { "field.weekday", "Ned\u0113\u013cas diena" },
+ { "field.dayperiod", "Dayperiod" },
+ { "field.hour", "Stundas" },
+ { "field.minute", "Min\u016btes" },
+ { "field.second", "Sekundes" },
+ { "field.zone", "Josla" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/mk/FormatData_mk.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/mk/FormatData_mk.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.mk;
import java.util.ListResourceBundle;
@@ -158,6 +194,24 @@
}
},
{ "DateTimePatternChars", "GuMtkHmsSEDFwWahKzZ" },
+ { "calendarname.islamic-civil", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0433\u0440\u0430\u0453\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamicc", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0433\u0440\u0430\u0453\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.roc", "\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u043d\u0430" },
+ { "calendarname.islamic", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.buddhist", "\u0411\u0443\u0434\u0438\u0441\u0442\u0438\u0447\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.japanese", "\u0408\u0430\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregorian", "\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregory", "\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "field.era", "\u0415\u0440\u0430" },
+ { "field.year", "\u0433\u043e\u0434\u0438\u043d\u0430" },
+ { "field.month", "\u041c\u0435\u0441\u0435\u0446" },
+ { "field.week", "\u041d\u0435\u0434\u0435\u043b\u0430" },
+ { "field.weekday", "\u0414\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430" },
+ { "field.dayperiod", "\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435/\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435" },
+ { "field.hour", "\u0427\u0430\u0441" },
+ { "field.minute", "\u041c\u0438\u043d\u0443\u0442\u0430" },
+ { "field.second", "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
+ { "field.zone", "\u0437\u043e\u043d\u0430" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ms/FormatData_ms.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ms/FormatData_ms.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
- * Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
- * Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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
@@ -14,10 +14,10 @@
* "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 (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
+ * to permit persons to whom the Data Files or Software are furnished to do so,
+ * provided that (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
@@ -27,19 +27,17 @@
* 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.
+ * 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.
+ * dealings in these Data Files or Software without prior written authorization
+ * of the copyright holder.
*/
-// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
package sun.text.resources.ms;
import java.util.ListResourceBundle;
@@ -191,6 +189,71 @@
"{1} {0}",
}
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/y G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/y G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/y G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "dd/MM/y GGGG",
+ "d/MM/y GGGG",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y G",
+ "d MMMM y G",
+ "dd/MM/y G",
+ "d/MM/y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "dd/MM/y GGGG",
+ "d/MM/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "Kalendar Sivil Islam" },
+ { "calendarname.islamicc", "Kalendar Sivil Islam" },
+ { "calendarname.islamic", "Kalendar Islam" },
+ { "calendarname.buddhist", "Kalendar Buddha" },
+ { "calendarname.japanese", "Kalendar Jepun" },
+ { "calendarname.roc", "Kalendar Minguo" },
+ { "calendarname.gregorian", "Kalendar Gregory" },
+ { "calendarname.gregory", "Kalendar Gregory" },
+ { "field.year", "Tahun" },
+ { "field.month", "Bulan" },
+ { "field.week", "Minggu" },
+ { "field.weekday", "Hari dalam Minggu" },
+ { "field.dayperiod", "PG/PTG" },
+ { "field.hour", "Jam" },
+ { "field.minute", "Minit" },
+ { "field.second", "Kedua" },
+ { "field.zone", "Zon Waktu" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/mt/FormatData_mt.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
- * Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
- * Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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
@@ -14,10 +14,10 @@
* "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 (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
+ * to permit persons to whom the Data Files or Software are furnished to do so,
+ * provided that (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
@@ -27,19 +27,17 @@
* 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.
+ * 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.
+ * dealings in these Data Files or Software without prior written authorization
+ * of the copyright holder.
*/
-// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
package sun.text.resources.mt;
import java.util.ListResourceBundle;
@@ -169,6 +167,22 @@
"{1} {0}",
}
},
+ { "calendarname.islamic-civil", "Kalendarju Islamiku-\u010aivili" },
+ { "calendarname.islamicc", "Kalendarju Islamiku-\u010aivili" },
+ { "calendarname.islamic", "Kalendarju Islamiku" },
+ { "calendarname.buddhist", "Kalendarju Buddist" },
+ { "calendarname.japanese", "Kalendarju \u0120appuni\u017c" },
+ { "calendarname.gregorian", "Kalendarju Gregorjan" },
+ { "calendarname.gregory", "Kalendarju Gregorjan" },
+ { "field.era", "Epoka" },
+ { "field.year", "Sena" },
+ { "field.month", "Xahar" },
+ { "field.week", "\u0120img\u0127a" },
+ { "field.weekday", "Jum tal-\u0120img\u0127a" },
+ { "field.hour", "Sieg\u0127a" },
+ { "field.minute", "Minuta" },
+ { "field.second", "Sekonda" },
+ { "field.zone", "\u017bona" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/nl/FormatData_nl.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.nl;
import java.util.ListResourceBundle;
@@ -158,6 +194,111 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd-MM-yy G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd-MM-yy GGGGG",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd-MM-yy GGGGG",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "d MMM y GGGG",
+ "dd-MM-yy G",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "Moeharram",
+ "Safar",
+ "Rabi\u02bba al awal",
+ "Rabi\u02bba al thani",
+ "Joemad\u02bbal awal",
+ "Joemad\u02bbal thani",
+ "Rajab",
+ "Sja\u02bbaban",
+ "Ramadan",
+ "Sjawal",
+ "Doe al ka\u02bbaba",
+ "Doe al hizja",
+ "",
+ }
+ },
+ { "islamic.MonthAbbreviations",
+ new String[] {
+ "Moeh.",
+ "Saf.",
+ "Rab. I",
+ "Rab. II",
+ "Joem. I",
+ "Joem. II",
+ "Raj.",
+ "Sja.",
+ "Ram.",
+ "Sjaw.",
+ "Doe al k.",
+ "Doe al h.",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "Sa\u02bbna Hizjria",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "dd-MM-yy G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "d MMM y GGGG",
+ "dd-MM-yy GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "Islamitische kalender (cyclisch)" },
+ { "calendarname.islamicc", "Islamitische kalender (cyclisch)" },
+ { "calendarname.roc", "Kalender van de Chinese Republiek" },
+ { "calendarname.islamic", "Islamitische kalender" },
+ { "calendarname.buddhist", "Boeddhistische kalender" },
+ { "calendarname.japanese", "Japanse kalender" },
+ { "calendarname.gregorian", "Gregoriaanse kalender" },
+ { "calendarname.gregory", "Gregoriaanse kalender" },
+ { "field.era", "Tijdperk" },
+ { "field.year", "Jaar" },
+ { "field.month", "Maand" },
+ { "field.weekday", "Dag van de week" },
+ { "field.dayperiod", "AM/PM" },
+ { "field.hour", "Uur" },
+ { "field.minute", "Minuut" },
+ { "field.second", "Seconde" },
+ { "field.zone", "Zone" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/pl/FormatData_pl.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/pl/FormatData_pl.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.pl;
import java.util.ListResourceBundle;
@@ -175,6 +211,71 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "d MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y GGGG",
+ "d MMMM, y GGGG",
+ "d MMM y GGGG",
+ "dd.MM.yyyy GGGG",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y G",
+ "d MMMM, y G",
+ "d MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM, y GGGG",
+ "d MMMM, y GGGG",
+ "d MMM y GGGG",
+ "dd.MM.yyyy GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "kalendarz islamski (metoda obliczeniowa)" },
+ { "calendarname.islamicc", "kalendarz islamski (metoda obliczeniowa)" },
+ { "calendarname.islamic", "kalendarz islamski (metoda wzrokowa)" },
+ { "calendarname.japanese", "kalendarz japo\u0144ski" },
+ { "calendarname.gregorian", "kalendarz gregoria\u0144ski" },
+ { "calendarname.gregory", "kalendarz gregoria\u0144ski" },
+ { "calendarname.roc", "kalendarz Republiki Chi\u0144skiej" },
+ { "calendarname.buddhist", "kalendarz buddyjski" },
+ { "field.era", "Era" },
+ { "field.year", "Rok" },
+ { "field.month", "Miesi\u0105c" },
+ { "field.week", "Tydzie\u0144" },
+ { "field.weekday", "Dzie\u0144 tygodnia" },
+ { "field.hour", "Godzina" },
+ { "field.minute", "Minuta" },
+ { "field.second", "Sekunda" },
+ { "field.zone", "Strefa" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/pt/FormatData_pt.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.pt;
import java.util.ListResourceBundle;
@@ -152,6 +188,64 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, G y MMMM dd",
+ "G y MMMM d",
+ "G y MMM d",
+ "d/M/yy",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/yyyy G",
+ "d/M/yyyy",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y GGGG",
+ "d 'de' MMMM 'de' y GGGG",
+ "dd/MM/yyyy GGGG",
+ "d/M/yyyy",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y G",
+ "d 'de' MMMM 'de' y G",
+ "dd/MM/yyyy G",
+ "d/M/yyyy",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, d 'de' MMMM 'de' y GGGG",
+ "d 'de' MMMM 'de' y GGGG",
+ "dd/MM/yyyy GGGG",
+ "d/M/yyyy",
+ }
+ },
+ { "calendarname.islamic-civil", "Calend\u00e1rio Civil Isl\u00e2mico" },
+ { "calendarname.islamicc", "Calend\u00e1rio Civil Isl\u00e2mico" },
+ { "calendarname.islamic", "Calend\u00e1rio Isl\u00e2mico" },
+ { "calendarname.japanese", "Calend\u00e1rio Japon\u00eas" },
+ { "calendarname.gregorian", "Calend\u00e1rio Gregoriano" },
+ { "calendarname.gregory", "Calend\u00e1rio Gregoriano" },
+ { "calendarname.roc", "Calend\u00e1rio da Rep\u00fablica da China" },
+ { "calendarname.buddhist", "Calend\u00e1rio Budista" },
+ { "field.era", "Era" },
+ { "field.year", "Ano" },
+ { "field.month", "M\u00eas" },
+ { "field.week", "Semana" },
+ { "field.weekday", "Dia da semana" },
+ { "field.dayperiod", "Per\u00edodo do dia" },
+ { "field.hour", "Hora" },
+ { "field.minute", "Minuto" },
+ { "field.second", "Segundo" },
+ { "field.zone", "Fuso" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ro/FormatData_ro.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ro/FormatData_ro.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.ro;
import java.util.ListResourceBundle;
@@ -187,6 +223,32 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, G y MMMM dd",
+ "d MMMM y G",
+ "d MMM y G",
+ "d/M/yyyy",
+ }
+ },
+ { "calendarname.islamic-civil", "calendar islamic civil" },
+ { "calendarname.islamicc", "calendar islamic civil" },
+ { "calendarname.roc", "calendar al Republicii Chineze" },
+ { "calendarname.islamic", "calendar islamic" },
+ { "calendarname.buddhist", "calendar budist" },
+ { "calendarname.japanese", "calendar japonez" },
+ { "calendarname.gregorian", "calendar gregorian" },
+ { "calendarname.gregory", "calendar gregorian" },
+ { "field.era", "er\u0103" },
+ { "field.year", "an" },
+ { "field.month", "lun\u0103" },
+ { "field.week", "s\u0103pt\u0103m\u00e2n\u0103" },
+ { "field.weekday", "zi a s\u0103pt\u0103m\u00e2nii" },
+ { "field.dayperiod", "perioada zilei" },
+ { "field.hour", "or\u0103" },
+ { "field.minute", "minut" },
+ { "field.second", "secund\u0103" },
+ { "field.zone", "zon\u0103" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/ru/FormatData_ru.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/ru/FormatData_ru.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.ru;
import java.util.ListResourceBundle;
@@ -203,6 +239,88 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y\u00a0'\u0433'. G",
+ "d MMMM y\u00a0'\u0433'. G",
+ "dd.MM.yyyy G",
+ "dd.MM.yy G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y\u00a0'\u0433'. G",
+ "d MMMM y\u00a0'\u0433'. G",
+ "dd.MM.yyyy G",
+ "dd.MM.yy G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y\u00a0'\u0433'. G",
+ "d MMMM y\u00a0'\u0433'. G",
+ "dd.MM.yyyy G",
+ "dd.MM.yy G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y\u00a0'\u0433'. GGGG",
+ "d MMMM y\u00a0'\u0433'. GGGG",
+ "dd.MM.yyyy GGGG",
+ "dd.MM.yy GGGG",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c",
+ "\u0421\u0430\u0444\u0430\u0440",
+ "\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c",
+ "\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0445\u0438\u0440",
+ "\u0414\u0436\u0443\u043c\u0430\u0434-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c",
+ "\u0414\u0436\u0443\u043c\u0430\u0434-\u0443\u043b\u044c-\u0430\u0445\u0438\u0440",
+ "\u0420\u0430\u0434\u0436\u0430\u0431",
+ "\u0428\u0430\u0430\u0431\u0430\u043d",
+ "\u0420\u0430\u043c\u0430\u0434\u0430\u043d",
+ "\u0428\u0430\u0432\u0432\u0430\u043b\u044c",
+ "\u0417\u0443\u043b\u044c-\u041a\u0430\u0430\u0434\u0430",
+ "\u0417\u0443\u043b\u044c-\u0425\u0438\u0434\u0436\u0436\u0430",
+ "",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y\u00a0'\u0433'. G",
+ "d MMMM y\u00a0'\u0433'. G",
+ "dd.MM.yyyy G",
+ "dd.MM.yy G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, d MMMM y\u00a0'\u0433'. GGGG",
+ "d MMMM y\u00a0'\u0433'. GGGG",
+ "dd.MM.yyyy GGGG",
+ "dd.MM.yy GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.islamicc", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.islamic", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.japanese", "\u042f\u043f\u043e\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.gregorian", "\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.gregory", "\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.roc", "\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "calendarname.buddhist", "\u0411\u0443\u0434\u0434\u0438\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" },
+ { "field.era", "\u042d\u0440\u0430" },
+ { "field.year", "\u0413\u043e\u0434" },
+ { "field.month", "\u041c\u0435\u0441\u044f\u0446" },
+ { "field.week", "\u041d\u0435\u0434\u0435\u043b\u044f" },
+ { "field.weekday", "\u0414\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" },
+ { "field.hour", "\u0427\u0430\u0441" },
+ { "field.minute", "\u041c\u0438\u043d\u0443\u0442\u0430" },
+ { "field.second", "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
+ { "field.zone", "\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/sk/FormatData_sk.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/sk/FormatData_sk.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.sk;
import java.util.ListResourceBundle;
@@ -192,6 +228,23 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "calendarname.islamic-civil", "Islamsk\u00fd ob\u010diansky kalend\u00e1r" },
+ { "calendarname.islamicc", "Islamsk\u00fd ob\u010diansky kalend\u00e1r" },
+ { "calendarname.islamic", "Islamsk\u00fd kalend\u00e1r" },
+ { "calendarname.buddhist", "Buddhistick\u00fd kalend\u00e1r" },
+ { "calendarname.japanese", "Japonsk\u00fd kalend\u00e1r" },
+ { "calendarname.gregorian", "Gregori\u00e1nsky kalend\u00e1r" },
+ { "calendarname.gregory", "Gregori\u00e1nsky kalend\u00e1r" },
+ { "field.era", "\u00c9ra" },
+ { "field.year", "Rok" },
+ { "field.month", "Mesiac" },
+ { "field.week", "T\u00fd\u017ede\u0148" },
+ { "field.weekday", "De\u0148 v t\u00fd\u017edni" },
+ { "field.dayperiod", "\u010cas\u0165 d\u0148a" },
+ { "field.hour", "Hodina" },
+ { "field.minute", "Min\u00fata" },
+ { "field.second", "Sekunda" },
+ { "field.zone", "P\u00e1smo" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/sl/FormatData_sl.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/sl/FormatData_sl.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.sl;
import java.util.ListResourceBundle;
@@ -175,6 +211,24 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "calendarname.islamic-civil", "islamski civilni koledar" },
+ { "calendarname.islamicc", "islamski civilni koledar" },
+ { "calendarname.roc", "kitajski dr\u017eavni koledar" },
+ { "calendarname.islamic", "islamski koledar" },
+ { "calendarname.buddhist", "budisti\u010dni koledar" },
+ { "calendarname.japanese", "japonski koledar" },
+ { "calendarname.gregorian", "gregorijanski koledar" },
+ { "calendarname.gregory", "gregorijanski koledar" },
+ { "field.era", "Doba" },
+ { "field.year", "Leto" },
+ { "field.month", "Mesec" },
+ { "field.week", "Teden" },
+ { "field.weekday", "Dan v tednu" },
+ { "field.dayperiod", "\u010cas dneva" },
+ { "field.hour", "Ura" },
+ { "field.minute", "Minuta" },
+ { "field.second", "Sekunda" },
+ { "field.zone", "Obmo\u010dje" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/sr/FormatData_sr.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
*/
/*
* COPYRIGHT AND PERMISSION NOTICE
*
- * Copyright (C) 1991-2007 Unicode, Inc. All rights reserved.
- * Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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
@@ -14,10 +14,10 @@
* "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 (a) the above copyright notice(s) and this permission
- * notice appear with all copies of the Data Files or Software, (b) both the
- * above copyright notice(s) and this permission notice appear in associated
+ * to permit persons to whom the Data Files or Software are furnished to do so,
+ * provided that (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
* documentation, and (c) there is clear notice in each modified Data File or
* in the Software as well as in the documentation associated with the Data
* File(s) or Software that the data or software has been modified.
@@ -27,19 +27,17 @@
* 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.
+ * 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.
+ * dealings in these Data Files or Software without prior written authorization
+ * of the copyright holder.
*/
-// Generated automatically from the Common Locale Data Repository. DO NOT EDIT!
-
package sun.text.resources.sr;
import java.util.ListResourceBundle;
@@ -176,6 +174,61 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, MMMM d, y G",
+ "MMMM d, y G",
+ "MMM d, y G",
+ "M/d/yy G",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "\u041f\u0440\u0435 \u0420\u041a",
+ "\u0420\u041a",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u041c\u0443\u0440\u0430\u0445\u0430\u043c",
+ "\u0421\u0430\u0444\u0430\u0440",
+ "\u0420\u0430\u0431\u0438\u02bb I",
+ "\u0420\u0430\u0431\u0438\u02bb II",
+ "\u0408\u0443\u043c\u0430\u0434\u0430 I",
+ "\u0408\u0443\u043c\u0430\u0434\u0430 II",
+ "\u0420\u0430\u0452\u0430\u0431",
+ "\u0428\u0430\u02bb\u0431\u0430\u043d",
+ "\u0420\u0430\u043c\u0430\u0434\u0430\u043d",
+ "\u0428\u0430\u0432\u0430\u043b",
+ "\u0414\u0443\u02bb\u043b-\u041a\u0438\u02bb\u0434\u0430",
+ "\u0414\u0443\u02bb\u043b-\u0445\u0438\u0452\u0430",
+ "",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "\u0410\u0425",
+ }
+ },
+ { "calendarname.islamic-civil", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u043d\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamicc", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u043d\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamic", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.japanese", "\u0408\u0430\u043f\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregorian", "\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregory", "\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.roc", "\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0435 \u041a\u0438\u043d\u0435" },
+ { "calendarname.buddhist", "\u0411\u0443\u0434\u0438\u0441\u0442\u0438\u0447\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "field.era", "\u0435\u0440\u0430" },
+ { "field.year", "\u0433\u043e\u0434\u0438\u043d\u0430" },
+ { "field.month", "\u043c\u0435\u0441\u0435\u0446" },
+ { "field.week", "\u043d\u0435\u0434\u0435\u0459\u0430" },
+ { "field.weekday", "\u0434\u0430\u043d \u0443 \u043d\u0435\u0434\u0435\u0459\u0438" },
+ { "field.dayperiod", "\u043f\u0440\u0435 \u043f\u043e\u0434\u043d\u0435/\u043f\u043e\u043f\u043e\u0434\u043d\u0435" },
+ { "field.hour", "\u0447\u0430\u0441" },
+ { "field.minute", "\u043c\u0438\u043d\u0443\u0442" },
+ { "field.second", "\u0441\u0435\u043a\u0443\u043d\u0434" },
+ { "field.zone", "\u0437\u043e\u043d\u0430" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/sv/FormatData_sv.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/sv/FormatData_sv.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.sv;
import java.util.ListResourceBundle;
@@ -198,6 +234,78 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "G yyyy-MM-dd",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "G y-MM-dd",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "f\u00f6re R.K.",
+ "R.K.",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "G y-MM-dd",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "d MMM y GGGG",
+ "GGGG y-MM-dd",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y G",
+ "d MMMM y G",
+ "d MMM y G",
+ "G y-MM-dd",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE d MMMM y GGGG",
+ "d MMMM y GGGG",
+ "d MMM y GGGG",
+ "GGGG y-MM-dd",
+ }
+ },
+ { "calendarname.islamic-civil", "islamisk civil kalender" },
+ { "calendarname.islamicc", "islamisk civil kalender" },
+ { "calendarname.islamic", "islamisk kalender" },
+ { "calendarname.japanese", "japansk kalender" },
+ { "calendarname.gregorian", "gregoriansk kalender" },
+ { "calendarname.gregory", "gregoriansk kalender" },
+ { "calendarname.roc", "kinesiska republikens kalender" },
+ { "calendarname.buddhist", "buddistisk kalender" },
+ { "field.era", "era" },
+ { "field.year", "\u00e5r" },
+ { "field.month", "m\u00e5nad" },
+ { "field.week", "vecka" },
+ { "field.weekday", "veckodag" },
+ { "field.dayperiod", "fm/em" },
+ { "field.hour", "timme" },
+ { "field.minute", "minut" },
+ { "field.second", "sekund" },
+ { "field.zone", "tidszon" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/th/FormatData_th.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/th/FormatData_th.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.th;
import java.util.ListResourceBundle;
@@ -182,6 +218,14 @@
{ "buddhist.TimePatterns",
timePatterns
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE\u0e17\u0e35\u0e48 d MMMM G y",
+ "d MMMM y",
+ "d MMM y",
+ "d/M/yyyy",
+ }
+ },
{ "buddhist.DatePatterns",
datePatterns
},
@@ -198,6 +242,77 @@
dateTimePatterns
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35G\u0e17\u0e35\u0e48 y",
+ "d MMMM \u0e1b\u0e35G y",
+ "d MMM G y",
+ "d/M/yy",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35G\u0e17\u0e35\u0e48 y",
+ "d MMMM \u0e1b\u0e35G y",
+ "d MMM G y",
+ "d/M/yy",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35GGGG\u0e17\u0e35\u0e48 y",
+ "d MMMM \u0e1b\u0e35GGGG y",
+ "d MMM GGGG y",
+ "d/M/yy",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u0e21\u0e38\u0e2e\u0e30\u0e23\u0e4c\u0e23\u0e2d\u0e21",
+ "\u0e0b\u0e2d\u0e1f\u0e32\u0e23\u0e4c",
+ "\u0e23\u0e2d\u0e1a\u0e35 I",
+ "\u0e23\u0e2d\u0e1a\u0e35 II",
+ "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 I",
+ "\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 II",
+ "\u0e23\u0e2d\u0e08\u0e31\u0e1a",
+ "\u0e0a\u0e30\u0e2d\u0e30\u0e1a\u0e32\u0e19",
+ "\u0e23\u0e2d\u0e21\u0e30\u0e14\u0e2d\u0e19",
+ "\u0e40\u0e0a\u0e32\u0e27\u0e31\u0e25",
+ "\u0e14\u0e2e\u0e38\u0e38\u0e2d\u0e31\u0e25\u0e01\u0e34\u0e14\u0e30\u0e2b\u0e4c",
+ "\u0e14\u0e2e\u0e38\u0e2d\u0e31\u0e25\u0e2e\u0e34\u0e08\u0e08\u0e30\u0e2b\u0e4c",
+ "",
+ }
+ },
+ { "islamic.long.Eras",
+ new String[] {
+ "",
+ "\u0e2e\u0e34\u0e08\u0e40\u0e23\u0e32\u0e30\u0e2b\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a",
+ }
+ },
+ { "islamic.Eras",
+ new String[] {
+ "",
+ "\u0e2e.\u0e28.",
+ }
+ },
+ { "calendarname.islamic-civil", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21\u0e0b\u0e35\u0e27\u0e34\u0e25" },
+ { "calendarname.islamicc", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21\u0e0b\u0e35\u0e27\u0e34\u0e25" },
+ { "calendarname.islamic", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21" },
+ { "calendarname.japanese", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e0d\u0e35\u0e48\u0e1b\u0e38\u0e48\u0e19" },
+ { "calendarname.gregorian", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e40\u0e01\u0e23\u0e01\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e19" },
+ { "calendarname.gregory", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e40\u0e01\u0e23\u0e01\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e19" },
+ { "calendarname.roc", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19" },
+ { "calendarname.buddhist", "\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e1e\u0e38\u0e17\u0e18" },
+ { "field.era", "\u0e2a\u0e21\u0e31\u0e22" },
+ { "field.year", "\u0e1b\u0e35" },
+ { "field.month", "\u0e40\u0e14\u0e37\u0e2d\u0e19" },
+ { "field.week", "\u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c" },
+ { "field.weekday", "\u0e27\u0e31\u0e19\u0e43\u0e19\u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c" },
+ { "field.dayperiod", "\u0e0a\u0e48\u0e27\u0e07\u0e27\u0e31\u0e19" },
+ { "field.hour", "\u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07" },
+ { "field.minute", "\u0e19\u0e32\u0e17\u0e35" },
+ { "field.second", "\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35" },
+ { "field.zone", "\u0e40\u0e02\u0e15" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/tr/FormatData_tr.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/tr/FormatData_tr.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.tr;
import java.util.ListResourceBundle;
@@ -176,6 +212,89 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "dd MMMM y G EEEE",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "dd MMMM y G EEEE",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "dd MMMM y G EEEE",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "dd MMMM y GGGG EEEE",
+ "dd MMMM y GGGG",
+ "dd MMM y GGGG",
+ "dd.MM.yyyy GGGG",
+ }
+ },
+ { "islamic.MonthNames",
+ new String[] {
+ "Muharrem",
+ "Safer",
+ "Rebi\u00fclevvel",
+ "Rebi\u00fclahir",
+ "Cemaziyelevvel",
+ "Cemaziyelahir",
+ "Recep",
+ "\u015eaban",
+ "Ramazan",
+ "\u015eevval",
+ "Zilkade",
+ "Zilhicce",
+ "",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "dd MMMM y G EEEE",
+ "dd MMMM y G",
+ "dd MMM y G",
+ "dd.MM.yyyy G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "dd MMMM y GGGG EEEE",
+ "dd MMMM y GGGG",
+ "dd MMM y GGGG",
+ "dd.MM.yyyy GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "Arap Takvimi" },
+ { "calendarname.islamicc", "Arap Takvimi" },
+ { "calendarname.islamic", "Hicri Takvim" },
+ { "calendarname.japanese", "Japon Takvimi" },
+ { "calendarname.gregorian", "Miladi Takvim" },
+ { "calendarname.gregory", "Miladi Takvim" },
+ { "calendarname.roc", "\u00c7in Cumhuriyeti Takvimi" },
+ { "calendarname.buddhist", "Budist Takvimi" },
+ { "field.era", "Miladi D\u00f6nem" },
+ { "field.year", "Y\u0131l" },
+ { "field.month", "Ay" },
+ { "field.week", "Hafta" },
+ { "field.weekday", "Haftan\u0131n G\u00fcn\u00fc" },
+ { "field.dayperiod", "AM/PM" },
+ { "field.hour", "Saat" },
+ { "field.minute", "Dakika" },
+ { "field.second", "Saniye" },
+ { "field.zone", "Saat Dilimi" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/uk/FormatData_uk.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/uk/FormatData_uk.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.uk;
import java.util.ListResourceBundle;
@@ -192,6 +228,41 @@
}
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
+ { "islamic.MonthNames",
+ new String[] {
+ "\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c",
+ "\u0421\u0430\u0444\u0430\u0440",
+ "\u0420\u0430\u0431\u0456 I",
+ "\u0420\u0430\u0431\u0456 II",
+ "\u0414\u0436\u0443\u043c\u0430\u0434\u0430 I",
+ "\u0414\u0436\u0443\u043c\u0430\u0434\u0430 II",
+ "\u0420\u0430\u0434\u0436\u0430\u0431",
+ "\u0428\u0430\u0430\u0431\u0430\u043d",
+ "\u0420\u0430\u043c\u0430\u0434\u0430\u043d",
+ "\u0414\u0430\u0432\u0432\u0430\u043b",
+ "\u0417\u0443-\u043b\u044c-\u043a\u0430\u0430\u0434\u0430",
+ "\u0417\u0443-\u043b\u044c-\u0445\u0456\u0434\u0436\u0430",
+ "",
+ }
+ },
+ { "calendarname.islamic-civil", "\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamicc", "\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.islamic", "\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.japanese", "\u042f\u043f\u043e\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregorian", "\u0413\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.gregory", "\u0413\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "calendarname.roc", "\u041a\u0438\u0442\u0430\u0439\u0441\u044c\u043a\u0438\u0439 \u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439" },
+ { "calendarname.buddhist", "\u0411\u0443\u0434\u0434\u0456\u0439\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440" },
+ { "field.era", "\u0415\u0440\u0430" },
+ { "field.year", "\u0420\u0456\u043a" },
+ { "field.month", "\u041c\u0456\u0441\u044f\u0446\u044c" },
+ { "field.week", "\u0422\u0438\u0436\u0434\u0435\u043d\u044c" },
+ { "field.weekday", "\u0414\u0435\u043d\u044c \u0442\u0438\u0436\u043d\u044f" },
+ { "field.dayperiod", "\u0427\u0430\u0441\u0442\u0438\u043d\u0430 \u0434\u043e\u0431\u0438" },
+ { "field.hour", "\u0413\u043e\u0434\u0438\u043d\u0430" },
+ { "field.minute", "\u0425\u0432\u0438\u043b\u0438\u043d\u0430" },
+ { "field.second", "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" },
+ { "field.zone", "\u0417\u043e\u043d\u0430" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/vi/FormatData_vi.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/vi/FormatData_vi.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,42 @@
* http://oss.software.ibm.com/cvs/icu/icu/source/data/locales/vi.txt?rev=1.38
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.vi;
import java.util.ListResourceBundle;
@@ -165,6 +201,72 @@
"{0} {1}" // date-time pattern
}
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
+ "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
+ "dd-MM-yyyy G",
+ "dd/MM/yyyy G",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
+ "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
+ "dd-MM-y G",
+ "dd/MM/y G",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
+ "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
+ "dd-MM-y G",
+ "dd/MM/y G",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG",
+ "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG",
+ "dd-MM-y GGGG",
+ "dd/MM/y GGGG",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y G",
+ "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y G",
+ "dd-MM-y G",
+ "dd/MM/y G",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG",
+ "'Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG",
+ "dd-MM-y GGGG",
+ "dd/MM/y GGGG",
+ }
+ },
+ { "calendarname.islamic-civil", "L\u1ecbch Islamic-Civil" },
+ { "calendarname.islamicc", "L\u1ecbch Islamic-Civil" },
+ { "calendarname.islamic", "L\u1ecbch Islamic" },
+ { "calendarname.buddhist", "L\u1ecbch Ph\u1eadt Gi\u00e1o" },
+ { "calendarname.japanese", "L\u1ecbch Nh\u1eadt B\u1ea3n" },
+ { "calendarname.roc", "L\u1ecbch Trung Hoa D\u00e2n Qu\u1ed1c" },
+ { "calendarname.gregorian", "L\u1ecbch Gregory" },
+ { "calendarname.gregory", "L\u1ecbch Gregory" },
+ { "field.era", "Th\u1eddi \u0111\u1ea1i" },
+ { "field.year", "N\u0103m" },
+ { "field.month", "Th\u00e1ng" },
+ { "field.week", "Tu\u1ea7n" },
+ { "field.weekday", "Ng\u00e0y trong tu\u1ea7n" },
+ { "field.dayperiod", "SA/CH" },
+ { "field.hour", "Gi\u1edd" },
+ { "field.minute", "Ph\u00fat" },
+ { "field.second", "Gi\u00e2y" },
+ { "field.zone", "M\u00fai gi\u1edd" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.zh;
import java.util.ListResourceBundle;
@@ -165,6 +201,78 @@
"{1} {0}" // date-time pattern
}
},
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gyyyy-M-d",
+ "Gy-M-d",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gyy-MM-dd",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "\u6c11\u56fd\u524d",
+ "\u6c11\u56fd",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy-M-d",
+ "Gy-M-d",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "GGGGy\u5e74M\u6708d\u65e5EEEE",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "GGGGy-M-d",
+ "GGGGy-M-d",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gyy-MM-dd",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "GGGGy\u5e74M\u6708d\u65e5EEEE",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "GGGGyy-MM-dd",
+ }
+ },
+ { "calendarname.islamic-civil", "\u4f0a\u65af\u5170\u5e0c\u5409\u6765\u5386" },
+ { "calendarname.islamicc", "\u4f0a\u65af\u5170\u5e0c\u5409\u6765\u5386" },
+ { "calendarname.islamic", "\u4f0a\u65af\u5170\u65e5\u5386" },
+ { "calendarname.japanese", "\u65e5\u672c\u65e5\u5386" },
+ { "calendarname.gregorian", "\u516c\u5386" },
+ { "calendarname.gregory", "\u516c\u5386" },
+ { "calendarname.roc", "\u6c11\u56fd\u65e5\u5386" },
+ { "calendarname.buddhist", "\u4f5b\u6559\u65e5\u5386" },
+ { "field.era", "\u65f6\u671f" },
+ { "field.year", "\u5e74" },
+ { "field.month", "\u6708" },
+ { "field.week", "\u5468" },
+ { "field.weekday", "\u5468\u5929" },
+ { "field.dayperiod", "\u4e0a\u5348/\u4e0b\u5348" },
+ { "field.hour", "\u5c0f\u65f6" },
+ { "field.minute", "\u5206\u949f" },
+ { "field.second", "\u79d2\u949f" },
+ { "field.zone", "\u533a\u57df" },
};
}
}
--- a/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_TW.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/text/resources/zh/FormatData_zh_TW.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,42 @@
*
*/
+/*
+ * COPYRIGHT AND PERMISSION NOTICE
+ *
+ * Copyright (C) 1991-2012 Unicode, Inc. All rights reserved. Distributed under
+ * the Terms of Use in http://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 (a) the above copyright notice(s) and this permission notice
+ * appear with all copies of the Data Files or Software, (b) both the above
+ * copyright notice(s) and this permission notice appear in associated
+ * documentation, and (c) there is clear notice in each modified Data File or
+ * in the Software as well as in the documentation associated with the Data
+ * File(s) or Software that the data or software has been modified.
+ *
+ * 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.
+ */
+
package sun.text.resources.zh;
import java.util.ListResourceBundle;
@@ -83,6 +119,77 @@
}
},
{ "DateTimePatternChars", "GyMdkHmsSEDFwWahKzZ" },
+ { "cldr.buddhist.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy/M/d",
+ "Gy/M/d",
+ }
+ },
+ { "cldr.japanese.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy/M/d",
+ "Gy/M/d",
+ }
+ },
+ { "roc.Eras",
+ new String[] {
+ "\u6c11\u570b\u524d",
+ "\u6c11\u570b",
+ }
+ },
+ { "cldr.roc.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy/M/d",
+ "Gy/M/d",
+ }
+ },
+ { "roc.DatePatterns",
+ new String[] {
+ "GGGGy\u5e74M\u6708d\u65e5EEEE",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "GGGGy/M/d",
+ "GGGGy/M/d",
+ }
+ },
+ { "cldr.islamic.DatePatterns",
+ new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy/M/d",
+ "Gy/M/d",
+ }
+ },
+ { "islamic.DatePatterns",
+ new String[] {
+ "GGGGy\u5e74M\u6708d\u65e5EEEE",
+ "GGGGy\u5e74M\u6708d\u65e5",
+ "GGGGy/M/d",
+ "GGGGy/M/d",
+ }
+ },
+ { "calendarname.islamic-civil", "\u4f0a\u65af\u862d\u57ce\u5e02\u66c6\u6cd5" },
+ { "calendarname.islamicc", "\u4f0a\u65af\u862d\u57ce\u5e02\u66c6\u6cd5" },
+ { "calendarname.islamic", "\u4f0a\u65af\u862d\u66c6\u6cd5" },
+ { "calendarname.japanese", "\u65e5\u672c\u66c6\u6cd5" },
+ { "calendarname.gregorian", "\u516c\u66c6" },
+ { "calendarname.gregory", "\u516c\u66c6" },
+ { "calendarname.roc", "\u6c11\u570b\u66c6" },
+ { "calendarname.buddhist", "\u4f5b\u6559\u66c6\u6cd5" },
+ { "field.era", "\u5e74\u4ee3" },
+ { "field.year", "\u5e74" },
+ { "field.month", "\u6708" },
+ { "field.week", "\u9031" },
+ { "field.weekday", "\u9031\u5929" },
+ { "field.dayperiod", "\u4e0a\u5348/\u4e0b\u5348" },
+ { "field.hour", "\u5c0f\u6642" },
+ { "field.minute", "\u5206\u9418" },
+ { "field.second", "\u79d2" },
};
}
}
--- a/jdk/src/share/classes/sun/util/locale/provider/CalendarDataUtility.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/util/locale/provider/CalendarDataUtility.java Mon Jan 21 11:16:36 2013 -0800
@@ -65,14 +65,27 @@
public static String retrieveFieldValueName(String id, int field, int value, int style, Locale locale) {
LocaleServiceProviderPool pool =
LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
- return pool.getLocalizedObject(CalendarFieldValueNameGetter.INSTANCE, locale, id,
+ return pool.getLocalizedObject(CalendarFieldValueNameGetter.INSTANCE, locale, normalizeCalendarType(id),
field, value, style);
}
public static Map<String, Integer> retrieveFieldValueNames(String id, int field, int style, Locale locale) {
LocaleServiceProviderPool pool =
LocaleServiceProviderPool.getPool(CalendarNameProvider.class);
- return pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale, id, field, style);
+ return pool.getLocalizedObject(CalendarFieldValueNamesMapGetter.INSTANCE, locale,
+ normalizeCalendarType(id), field, style);
+ }
+
+ private static String normalizeCalendarType(String requestID) {
+ String type;
+ if (requestID.equals("gregorian") || requestID.equals("iso8601")) {
+ type = "gregory";
+ } else if (requestID.startsWith("islamic")) {
+ type = "islamic";
+ } else {
+ type = requestID;
+ }
+ return type;
}
/**
--- a/jdk/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -163,6 +163,8 @@
case "buddhist":
case "japanese":
case "gregory":
+ case "islamic":
+ case "roc":
break;
default:
// Unknown calendar type
@@ -239,6 +241,9 @@
break;
case MONTH:
+ if ("islamic".equals(type)) {
+ key.append(type).append('.');
+ }
if (isStandalone) {
key.append("standalone.");
}
--- a/jdk/src/share/classes/sun/util/locale/provider/LocaleResources.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/src/share/classes/sun/util/locale/provider/LocaleResources.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -387,6 +387,15 @@
return numberPatterns;
}
+ /**
+ * Returns the FormatData resource bundle of this LocaleResources.
+ * The FormatData should be used only for accessing extra
+ * resources required by JSR 310.
+ */
+ public ResourceBundle getFormatData() {
+ return localeData.getDateFormatData(locale);
+ }
+
private String getDateTimePattern(String key, int styleIndex, String calendarType) {
String resourceKey = "gregory".equals(calendarType) ? key : calendarType + "." + key;
String cacheKey = DATE_TIME_PATTERN + resourceKey;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Calendar/CldrFormatNamesTest.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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
+ * @bug 8004489 8006509
+ * @compile -XDignore.symbol.file CldrFormatNamesTest.java
+ * @run main/othervm -Djava.locale.providers=CLDR CldrFormatNamesTest
+ * @summary Unit test for CLDR FormatData resources
+ */
+
+import java.util.*;
+import static java.util.Calendar.*;
+import sun.util.locale.provider.*;
+
+public class CldrFormatNamesTest {
+ private static final Locale ARABIC = new Locale("ar");
+ private static final Locale ZH_HANT = Locale.forLanguageTag("zh-Hant");
+
+ /*
+ * The first element is a Locale followed by key-value pairs
+ * in a FormatData resource bundle. The value type is either
+ * String or String[].
+ */
+ static final Object[][] CLDR_DATA = {
+ {
+ Locale.JAPAN,
+ "field.zone", "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3",
+ "cldr.japanese.DatePatterns", new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gyy/MM/dd",
+ },
+ "cldr.roc.DatePatterns", new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy/MM/dd",
+ "Gy/MM/dd",
+ },
+ "calendarname.buddhist", "\u30bf\u30a4\u4ecf\u6559\u66a6",
+ },
+ {
+ Locale.PRC,
+ "field.zone", "\u533a\u57df",
+ "cldr.islamic.DatePatterns", new String[] {
+ "Gy\u5e74M\u6708d\u65e5EEEE",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gy\u5e74M\u6708d\u65e5",
+ "Gyy-MM-dd",
+ },
+ "calendarname.islamic", "\u4f0a\u65af\u5170\u65e5\u5386",
+ },
+ {
+ Locale.GERMANY,
+ "field.dayperiod", "Tagesh\u00e4lfte",
+ "cldr.islamic.DatePatterns", new String[] {
+ "EEEE d. MMMM y G",
+ "d. MMMM y G",
+ "d. MMM y G",
+ "d.M.y G",
+ },
+ "calendarname.islamic", "Islamischer Kalender",
+ },
+ };
+
+ // Islamic calendar symbol names in ar
+ private static final String[] ISLAMIC_MONTH_NAMES = {
+ "\u0645\u062d\u0631\u0645",
+ "\u0635\u0641\u0631",
+ "\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644",
+ "\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631",
+ "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649",
+ "\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629",
+ "\u0631\u062c\u0628",
+ "\u0634\u0639\u0628\u0627\u0646",
+ "\u0631\u0645\u0636\u0627\u0646",
+ "\u0634\u0648\u0627\u0644",
+ "\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629",
+ "\u0630\u0648 \u0627\u0644\u062d\u062c\u0629",
+ };
+ private static final String[] ISLAMIC_ERA_NAMES = {
+ "",
+ "\u0647\u0640",
+ };
+
+ // Minguo calendar symbol names in zh_Hant
+ private static final String[] ROC_ERA_NAMES = {
+ "\u6c11\u570b\u524d",
+ "\u6c11\u570b",
+ };
+
+ private static int errors = 0;
+
+ // This test is CLDR data dependent.
+ public static void main(String[] args) {
+ for (Object[] data : CLDR_DATA) {
+ Locale locale = (Locale) data[0];
+ ResourceBundle rb = LocaleProviderAdapter.getResourceBundleBased()
+ .getLocaleResources(locale).getFormatData();
+ for (int i = 1; i < data.length; ) {
+ String key = (String) data[i++];
+ Object expected = data[i++];
+ if (rb.containsKey(key)) {
+ Object value = rb.getObject(key);
+ if (expected instanceof String) {
+ if (!expected.equals(value)) {
+ errors++;
+ System.err.printf("error: key='%s', got '%s' expected '%s'%n",
+ key, value, expected);
+ }
+ } else if (expected instanceof String[]) {
+ try {
+ if (!Arrays.equals((Object[]) value, (Object[]) expected)) {
+ errors++;
+ System.err.printf("error: key='%s', got '%s' expected '%s'%n",
+ key, Arrays.asList((Object[])value),
+ Arrays.asList((Object[])expected));
+ }
+ } catch (Exception e) {
+ errors++;
+ e.printStackTrace();
+ }
+ }
+ } else {
+ errors++;
+ System.err.println("No resource for " + key);
+ }
+ }
+ }
+
+ // test Islamic calendar names in Arabic
+ testSymbolNames(ARABIC, "islamic", ISLAMIC_MONTH_NAMES, MONTH, LONG, "month");
+ testSymbolNames(ARABIC, "islamic", ISLAMIC_ERA_NAMES, ERA, SHORT, "era");
+
+ // test ROC (Minguo) calendar names in zh-Hant
+ testSymbolNames(ZH_HANT, "roc", ROC_ERA_NAMES, ERA, SHORT, "era");
+
+ if (errors > 0) {
+ throw new RuntimeException("test failed");
+ }
+ }
+
+ private static void testSymbolNames(Locale locale, String calType, String[] expected,
+ int field, int style, String fieldName) {
+ for (int i = 0; i < expected.length; i++) {
+ String expt = expected[i];
+ String name = CalendarDataUtility.retrieveFieldValueName(calType, field, i, style, locale);
+ if (!expt.equals(name)) {
+ errors++;
+ System.err.printf("error: wrong %s %s name in %s: value=%d, got='%s', expected='%s'%n",
+ calType, fieldName, locale, i, name, expt);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/atomic/DoubleAdderDemo.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/* Adapted from Dougs CVS test/jsr166e/DoubleAdderDemo.java
+ *
+ * The demo is a micro-benchmark to compare synchronized access to a primitive
+ * double and DoubleAdder (run without any args), this restricted version simply
+ * exercises the basic functionality of DoubleAdder, suitable for automated
+ * testing (-shortrun).
+ */
+
+/*
+ * @test
+ * @bug 8005311
+ * @run main DoubleAdderDemo -shortrun
+ * @summary Basic test for Doubledder
+ */
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.atomic.DoubleAdder;
+
+public class DoubleAdderDemo {
+ static final int INCS_PER_THREAD = 10000000;
+ static final int NCPU = Runtime.getRuntime().availableProcessors();
+ static final int SHORT_RUN_MAX_THREADS = NCPU > 1 ? NCPU / 2 : 1;
+ static final int LONG_RUN_MAX_THREADS = NCPU * 2;
+ static final ExecutorService pool = Executors.newCachedThreadPool();
+
+ static final class SynchronizedDoubleAdder {
+ double value;
+ synchronized double sum() { return value; }
+ synchronized void add(double x) { value += x; }
+ }
+
+ public static void main(String[] args) {
+ boolean shortRun = args.length > 0 && args[0].equals("-shortrun");
+ int maxNumThreads = shortRun ? SHORT_RUN_MAX_THREADS : LONG_RUN_MAX_THREADS;
+
+ System.out.println("Warmup...");
+ int half = NCPU > 1 ? NCPU / 2 : 1;
+ if (!shortRun)
+ syncTest(half, 1000);
+ adderTest(half, 1000);
+
+ for (int reps = 0; reps < 2; ++reps) {
+ System.out.println("Running...");
+ for (int i = 1; i <= maxNumThreads; i <<= 1) {
+ if (!shortRun)
+ syncTest(i, INCS_PER_THREAD);
+ adderTest(i, INCS_PER_THREAD);
+ }
+ }
+ pool.shutdown();
+ }
+
+ static void syncTest(int nthreads, int incs) {
+ System.out.print("Synchronized ");
+ Phaser phaser = new Phaser(nthreads + 1);
+ SynchronizedDoubleAdder a = new SynchronizedDoubleAdder();
+ for (int i = 0; i < nthreads; ++i)
+ pool.execute(new SyncTask(a, phaser, incs));
+ report(nthreads, incs, timeTasks(phaser), a.sum());
+ }
+
+ static void adderTest(int nthreads, int incs) {
+ System.out.print("DoubleAdder ");
+ Phaser phaser = new Phaser(nthreads + 1);
+ DoubleAdder a = new DoubleAdder();
+ for (int i = 0; i < nthreads; ++i)
+ pool.execute(new AdderTask(a, phaser, incs));
+ report(nthreads, incs, timeTasks(phaser), a.sum());
+ }
+
+ static void report(int nthreads, int incs, long time, double sum) {
+ long total = (long)nthreads * incs;
+ if (sum != (double)total)
+ throw new Error(sum + " != " + total);
+ double secs = (double)time / (1000L * 1000 * 1000);
+ long rate = total * (1000L) / time;
+ System.out.printf("threads:%3d Time: %7.3fsec Incs per microsec: %4d\n",
+ nthreads, secs, rate);
+ }
+
+ static long timeTasks(Phaser phaser) {
+ phaser.arriveAndAwaitAdvance();
+ long start = System.nanoTime();
+ phaser.arriveAndAwaitAdvance();
+ phaser.arriveAndAwaitAdvance();
+ return System.nanoTime() - start;
+ }
+
+ static final class AdderTask implements Runnable {
+ final DoubleAdder adder;
+ final Phaser phaser;
+ final int incs;
+ volatile double result;
+ AdderTask(DoubleAdder adder, Phaser phaser, int incs) {
+ this.adder = adder;
+ this.phaser = phaser;
+ this.incs = incs;
+ }
+
+ public void run() {
+ phaser.arriveAndAwaitAdvance();
+ phaser.arriveAndAwaitAdvance();
+ DoubleAdder a = adder;
+ for (int i = 0; i < incs; ++i)
+ a.add(1.0);
+ result = a.sum();
+ phaser.arrive();
+ }
+ }
+
+ static final class SyncTask implements Runnable {
+ final SynchronizedDoubleAdder adder;
+ final Phaser phaser;
+ final int incs;
+ volatile double result;
+ SyncTask(SynchronizedDoubleAdder adder, Phaser phaser, int incs) {
+ this.adder = adder;
+ this.phaser = phaser;
+ this.incs = incs;
+ }
+
+ public void run() {
+ phaser.arriveAndAwaitAdvance();
+ phaser.arriveAndAwaitAdvance();
+ SynchronizedDoubleAdder a = adder;
+ for (int i = 0; i < incs; ++i)
+ a.add(1.0);
+ result = a.sum();
+ phaser.arrive();
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/concurrent/atomic/LongAdderDemo.java Mon Jan 21 11:16:36 2013 -0800
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * 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.
+ */
+
+/*
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+/* Adapted from Dougs CVS test/jsr166e/LongAdderDemo.java
+ *
+ * The demo is a micro-benchmark to compare AtomicLong and LongAdder (run
+ * without any args), this restricted version simply exercises the basic
+ * functionality of LongAdder, suitable for automated testing (-shortrun).
+ */
+
+/*
+ * @test
+ * @bug 8005311
+ * @run main LongAdderDemo -shortrun
+ * @summary Basic test for LongAdder
+ */
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+
+public class LongAdderDemo {
+ static final int INCS_PER_THREAD = 10000000;
+ static final int NCPU = Runtime.getRuntime().availableProcessors();
+ static final int SHORT_RUN_MAX_THREADS = NCPU > 1 ? NCPU / 2 : 1;
+ static final int LONG_RUN_MAX_THREADS = NCPU * 2;
+ static final ExecutorService pool = Executors.newCachedThreadPool();
+
+ public static void main(String[] args) {
+ boolean shortRun = args.length > 0 && args[0].equals("-shortrun");
+ int maxNumThreads = shortRun ? SHORT_RUN_MAX_THREADS : LONG_RUN_MAX_THREADS;
+
+ System.out.println("Warmup...");
+ int half = NCPU > 1 ? NCPU / 2 : 1;
+ if (!shortRun)
+ casTest(half, 1000);
+ adderTest(half, 1000);
+
+ for (int reps = 0; reps < 2; ++reps) {
+ System.out.println("Running...");
+ for (int i = 1; i <= maxNumThreads; i <<= 1) {
+ if (!shortRun)
+ casTest(i, INCS_PER_THREAD);
+ adderTest(i, INCS_PER_THREAD);
+ }
+ }
+ pool.shutdown();
+ }
+
+ static void casTest(int nthreads, int incs) {
+ System.out.print("AtomicLong ");
+ Phaser phaser = new Phaser(nthreads + 1);
+ AtomicLong a = new AtomicLong();
+ for (int i = 0; i < nthreads; ++i)
+ pool.execute(new CasTask(a, phaser, incs));
+ report(nthreads, incs, timeTasks(phaser), a.get());
+ }
+
+ static void adderTest(int nthreads, int incs) {
+ System.out.print("LongAdder ");
+ Phaser phaser = new Phaser(nthreads + 1);
+ LongAdder a = new LongAdder();
+ for (int i = 0; i < nthreads; ++i)
+ pool.execute(new AdderTask(a, phaser, incs));
+ report(nthreads, incs, timeTasks(phaser), a.sum());
+ }
+
+ static void report(int nthreads, int incs, long time, long sum) {
+ long total = (long)nthreads * incs;
+ if (sum != total)
+ throw new Error(sum + " != " + total);
+ double secs = (double)time / (1000L * 1000 * 1000);
+ long rate = total * (1000L) / time;
+ System.out.printf("threads:%3d Time: %7.3fsec Incs per microsec: %4d\n",
+ nthreads, secs, rate);
+ }
+
+ static long timeTasks(Phaser phaser) {
+ phaser.arriveAndAwaitAdvance();
+ long start = System.nanoTime();
+ phaser.arriveAndAwaitAdvance();
+ phaser.arriveAndAwaitAdvance();
+ return System.nanoTime() - start;
+ }
+
+ static final class AdderTask implements Runnable {
+ final LongAdder adder;
+ final Phaser phaser;
+ final int incs;
+ volatile long result;
+ AdderTask(LongAdder adder, Phaser phaser, int incs) {
+ this.adder = adder;
+ this.phaser = phaser;
+ this.incs = incs;
+ }
+
+ public void run() {
+ phaser.arriveAndAwaitAdvance();
+ phaser.arriveAndAwaitAdvance();
+ LongAdder a = adder;
+ for (int i = 0; i < incs; ++i)
+ a.increment();
+ result = a.sum();
+ phaser.arrive();
+ }
+ }
+
+ static final class CasTask implements Runnable {
+ final AtomicLong adder;
+ final Phaser phaser;
+ final int incs;
+ volatile long result;
+ CasTask(AtomicLong adder, Phaser phaser, int incs) {
+ this.adder = adder;
+ this.phaser = phaser;
+ this.incs = incs;
+ }
+
+ public void run() {
+ phaser.arriveAndAwaitAdvance();
+ phaser.arriveAndAwaitAdvance();
+ AtomicLong a = adder;
+ for (int i = 0; i < incs; ++i)
+ a.getAndIncrement();
+ result = a.get();
+ phaser.arrive();
+ }
+ }
+
+}
--- a/jdk/test/sun/security/tools/policytool/UpdatePermissions.html Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/test/sun/security/tools/policytool/UpdatePermissions.html Mon Jan 21 11:16:36 2013 -0800
@@ -42,7 +42,7 @@
setSecurityManager,
shutdownHooks,
stopThread<br>
- SecurityPermission: printIdentity<br><br>
+ SecurityPermission: createAccessControlContext<br><br>
In the confirmation dialog pop-up, click "OK".<br><br>
--- a/jdk/test/sun/text/resources/LocaleData Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/test/sun/text/resources/LocaleData Mon Jan 21 11:16:36 2013 -0800
@@ -7660,3 +7660,1137 @@
# bug 7195759
CurrencyNames//ZMW=ZMW
+
+# rfe 8004489, 8006509
+FormatData//calendarname.buddhist=Buddhist Calendar
+FormatData//calendarname.gregorian=Gregorian Calendar
+FormatData//calendarname.gregory=Gregorian Calendar
+FormatData//calendarname.islamic-civil=Islamic-Civil Calendar
+FormatData//calendarname.islamic=Islamic Calendar
+FormatData//calendarname.islamicc=Islamic-Civil Calendar
+FormatData//calendarname.japanese=Japanese Calendar
+FormatData//calendarname.roc=Minguo Calendar
+FormatData//field.dayperiod=Dayperiod
+FormatData//field.era=Era
+FormatData//field.hour=Hour
+FormatData//field.minute=Minute
+FormatData//field.month=Month
+FormatData//field.second=Second
+FormatData//field.week=Week
+FormatData//field.weekday=Day of the Week
+FormatData//field.year=Year
+FormatData//field.zone=Zone
+FormatData//islamic.Eras/0=
+FormatData//islamic.Eras/1=AH
+FormatData//islamic.MonthNames/0=Muharram
+FormatData//islamic.MonthNames/1=Safar
+FormatData//islamic.MonthNames/2=Rabi\u02bb I
+FormatData//islamic.MonthNames/3=Rabi\u02bb II
+FormatData//islamic.MonthNames/4=Jumada I
+FormatData//islamic.MonthNames/5=Jumada II
+FormatData//islamic.MonthNames/6=Rajab
+FormatData//islamic.MonthNames/7=Sha\u02bbban
+FormatData//islamic.MonthNames/8=Ramadan
+FormatData//islamic.MonthNames/9=Shawwal
+FormatData//islamic.MonthNames/10=Dhu\u02bbl-Qi\u02bbdah
+FormatData//islamic.MonthNames/11=Dhu\u02bbl-Hijjah
+FormatData//islamic.MonthNames/12=
+FormatData//islamic.MonthAbbreviations/0=Muh.
+FormatData//islamic.MonthAbbreviations/1=Saf.
+FormatData//islamic.MonthAbbreviations/2=Rab. I
+FormatData//islamic.MonthAbbreviations/3=Rab. II
+FormatData//islamic.MonthAbbreviations/4=Jum. I
+FormatData//islamic.MonthAbbreviations/5=Jum. II
+FormatData//islamic.MonthAbbreviations/6=Raj.
+FormatData//islamic.MonthAbbreviations/7=Sha.
+FormatData//islamic.MonthAbbreviations/8=Ram.
+FormatData//islamic.MonthAbbreviations/9=Shaw.
+FormatData//islamic.MonthAbbreviations/10=Dhu\u02bbl-Q.
+FormatData//islamic.MonthAbbreviations/11=Dhu\u02bbl-H.
+FormatData//islamic.MonthAbbreviations/12=
+FormatData//islamic.DatePatterns/0=EEEE, MMMM d, y GGGG
+FormatData//islamic.DatePatterns/1=MMMM d, y GGGG
+FormatData//islamic.DatePatterns/2=MMM d, y GGGG
+FormatData//islamic.DatePatterns/3=M/d/yy GGGG
+FormatData//roc.Eras/0=Before R.O.C.
+FormatData//roc.Eras/1=R.O.C.
+FormatData//roc.DatePatterns/0=EEEE, GGGG y MMMM dd
+FormatData//roc.DatePatterns/1=GGGG y MMMM d
+FormatData//roc.DatePatterns/2=GGGG y MMM d
+FormatData//roc.DatePatterns/3=G yyy-MM-dd
+FormatData/ar/calendarname.buddhist=\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0628\u0648\u0630\u064a
+FormatData/ar/calendarname.gregorian=\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0645\u064a\u0644\u0627\u062f\u064a
+FormatData/ar/calendarname.gregory=\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0645\u064a\u0644\u0627\u062f\u064a
+FormatData/ar/calendarname.islamic-civil=\u062a\u0642\u0648\u064a\u0645 \u0627\u0633\u0644\u0627\u0645\u064a \u0645\u062f\u0646\u064a
+FormatData/ar/calendarname.islamic=\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u0647\u062c\u0631\u064a
+FormatData/ar/calendarname.islamicc=\u062a\u0642\u0648\u064a\u0645 \u0627\u0633\u0644\u0627\u0645\u064a \u0645\u062f\u0646\u064a
+FormatData/ar/calendarname.japanese=\u0627\u0644\u062a\u0642\u0648\u064a\u0645 \u0627\u0644\u064a\u0627\u0628\u0627\u0646\u064a
+FormatData/ar/calendarname.roc=\u062a\u0642\u0648\u064a\u0645 \u0645\u064a\u0646\u062c\u0648
+FormatData/ar/field.dayperiod=\u0635/\u0645
+FormatData/ar/field.era=\u0627\u0644\u0639\u0635\u0631
+FormatData/ar/field.hour=\u0627\u0644\u0633\u0627\u0639\u0627\u062a
+FormatData/ar/field.minute=\u0627\u0644\u062f\u0642\u0627\u0626\u0642
+FormatData/ar/field.month=\u0627\u0644\u0634\u0647\u0631
+FormatData/ar/field.second=\u0627\u0644\u062b\u0648\u0627\u0646\u064a
+FormatData/ar/field.week=\u0627\u0644\u0623\u0633\u0628\u0648\u0639
+FormatData/ar/field.weekday=\u0627\u0644\u064a\u0648\u0645
+FormatData/ar/field.year=\u0627\u0644\u0633\u0646\u0629
+FormatData/ar/field.zone=\u0627\u0644\u062a\u0648\u0642\u064a\u062a
+FormatData/ar/islamic.MonthNames/0=\u0645\u062d\u0631\u0645
+FormatData/ar/islamic.MonthNames/1=\u0635\u0641\u0631
+FormatData/ar/islamic.MonthNames/2=\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar/islamic.MonthNames/3=\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631
+FormatData/ar/islamic.MonthNames/4=\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649
+FormatData/ar/islamic.MonthNames/5=\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629
+FormatData/ar/islamic.MonthNames/6=\u0631\u062c\u0628
+FormatData/ar/islamic.MonthNames/7=\u0634\u0639\u0628\u0627\u0646
+FormatData/ar/islamic.MonthNames/8=\u0631\u0645\u0636\u0627\u0646
+FormatData/ar/islamic.MonthNames/9=\u0634\u0648\u0627\u0644
+FormatData/ar/islamic.MonthNames/10=\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629
+FormatData/ar/islamic.MonthNames/11=\u0630\u0648 \u0627\u0644\u062d\u062c\u0629
+FormatData/ar/islamic.MonthNames/12=
+FormatData/ar/islamic.MonthAbbreviations/0=\u0645\u062d\u0631\u0645
+FormatData/ar/islamic.MonthAbbreviations/1=\u0635\u0641\u0631
+FormatData/ar/islamic.MonthAbbreviations/2=\u0631\u0628\u064a\u0639 \u0627\u0644\u0623\u0648\u0644
+FormatData/ar/islamic.MonthAbbreviations/3=\u0631\u0628\u064a\u0639 \u0627\u0644\u0622\u062e\u0631
+FormatData/ar/islamic.MonthAbbreviations/4=\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0623\u0648\u0644\u0649
+FormatData/ar/islamic.MonthAbbreviations/5=\u062c\u0645\u0627\u062f\u0649 \u0627\u0644\u0622\u062e\u0631\u0629
+FormatData/ar/islamic.MonthAbbreviations/6=\u0631\u062c\u0628
+FormatData/ar/islamic.MonthAbbreviations/7=\u0634\u0639\u0628\u0627\u0646
+FormatData/ar/islamic.MonthAbbreviations/8=\u0631\u0645\u0636\u0627\u0646
+FormatData/ar/islamic.MonthAbbreviations/9=\u0634\u0648\u0627\u0644
+FormatData/ar/islamic.MonthAbbreviations/10=\u0630\u0648 \u0627\u0644\u0642\u0639\u062f\u0629
+FormatData/ar/islamic.MonthAbbreviations/11=\u0630\u0648 \u0627\u0644\u062d\u062c\u0629
+FormatData/ar/islamic.MonthAbbreviations/12=
+FormatData/ar/islamic.Eras/0=
+FormatData/ar/islamic.Eras/1=\u0647\u0640
+FormatData//islamic.DatePatterns/0=EEEE, MMMM d, y GGGG
+FormatData//islamic.DatePatterns/1=MMMM d, y GGGG
+FormatData//islamic.DatePatterns/2=MMM d, y GGGG
+FormatData//islamic.DatePatterns/3=M/d/yy GGGG
+FormatData/ar/roc.DatePatterns/0=EEEE\u060c d MMMM\u060c y GGGG
+FormatData/ar/roc.DatePatterns/1=d MMMM\u060c y GGGG
+FormatData/ar/roc.DatePatterns/2=dd\u200f/MM\u200f/y GGGG
+FormatData/ar/roc.DatePatterns/3=d\u200f/M\u200f/y GGGG
+FormatData/be/calendarname.buddhist=\u0431\u0443\u0434\u044b\u0441\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/calendarname.gregorian=\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/calendarname.gregory=\u0433\u0440\u044d\u0433\u0430\u0440\u044b\u044f\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/calendarname.islamic-civil=\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/calendarname.islamic=\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/calendarname.islamicc=\u043c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u043a\u0456 \u0441\u0432\u0435\u0446\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/calendarname.japanese=\u044f\u043f\u043e\u043d\u0441\u043a\u0456 \u043a\u0430\u043b\u044f\u043d\u0434\u0430\u0440
+FormatData/be/field.era=\u044d\u0440\u0430
+FormatData/be/field.hour=\u0433\u0430\u0434\u0437\u0456\u043d\u0430
+FormatData/be/field.minute=\u0445\u0432\u0456\u043b\u0456\u043d\u0430
+FormatData/be/field.month=\u043c\u0435\u0441\u044f\u0446
+FormatData/be/field.second=\u0441\u0435\u043a\u0443\u043d\u0434\u0430
+FormatData/be/field.week=\u0442\u044b\u0434\u0437\u0435\u043d\u044c
+FormatData/be/field.weekday=\u0434\u0437\u0435\u043d\u044c \u0442\u044b\u0434\u043d\u044f
+FormatData/be/field.year=\u0433\u043e\u0434
+FormatData/bg/calendarname.buddhist=\u0411\u0443\u0434\u0438\u0441\u0442\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.gregorian=\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.gregory=\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.islamic-civil=\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.islamic=\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.islamicc=\u0418\u0441\u043b\u044f\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u0435\u043d \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.japanese=\u042f\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/bg/calendarname.roc=\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u0442\u0430\u0439
+FormatData/bg/field.dayperiod=\u0434\u0435\u043d
+FormatData/bg/field.era=\u0435\u0440\u0430
+FormatData/bg/field.hour=\u0447\u0430\u0441
+FormatData/bg/field.minute=\u043c\u0438\u043d\u0443\u0442\u0430
+FormatData/bg/field.month=\u043c\u0435\u0441\u0435\u0446
+FormatData/bg/field.second=\u0441\u0435\u043a\u0443\u043d\u0434\u0430
+FormatData/bg/field.week=\u0441\u0435\u0434\u043c\u0438\u0446\u0430
+FormatData/bg/field.weekday=\u0414\u0435\u043d \u043e\u0442 \u0441\u0435\u0434\u043c\u0438\u0446\u0430\u0442\u0430
+FormatData/bg/field.year=\u0433\u043e\u0434\u0438\u043d\u0430
+FormatData/bg/field.zone=\u0437\u043e\u043d\u0430
+FormatData/bg/islamic.MonthNames/0=\u043c\u0443\u0445\u0430\u0440\u0430\u043c
+FormatData/bg/islamic.MonthNames/1=\u0441\u0430\u0444\u0430\u0440
+FormatData/bg/islamic.MonthNames/2=\u0440\u0430\u0431\u0438-1
+FormatData/bg/islamic.MonthNames/3=\u0440\u0430\u0431\u0438-2
+FormatData/bg/islamic.MonthNames/4=\u0434\u0436\u0443\u043c\u0430\u0434\u0430-1
+FormatData/bg/islamic.MonthNames/5=\u0434\u0436\u0443\u043c\u0430\u0434\u0430-2
+FormatData/bg/islamic.MonthNames/6=\u0440\u0430\u0434\u0436\u0430\u0431
+FormatData/bg/islamic.MonthNames/7=\u0448\u0430\u0431\u0430\u043d
+FormatData/bg/islamic.MonthNames/8=\u0440\u0430\u043c\u0430\u0437\u0430\u043d
+FormatData/bg/islamic.MonthNames/9=\u0428\u0430\u0432\u0430\u043b
+FormatData/bg/islamic.MonthNames/10=\u0414\u0445\u0443\u043b-\u041a\u0430\u0430\u0434\u0430
+FormatData/bg/islamic.MonthNames/11=\u0414\u0445\u0443\u043b-\u0445\u0438\u0434\u0436\u0430
+FormatData/bg/islamic.MonthNames/12=
+FormatData/ca/calendarname.buddhist=calendari budista
+FormatData/ca/calendarname.gregorian=calendari gregori\u00e0
+FormatData/ca/calendarname.gregory=calendari gregori\u00e0
+FormatData/ca/calendarname.islamic-civil=calendari civil isl\u00e0mic
+FormatData/ca/calendarname.islamic=calendari musulm\u00e0
+FormatData/ca/calendarname.islamicc=calendari civil isl\u00e0mic
+FormatData/ca/calendarname.japanese=calendari japon\u00e8s
+FormatData/ca/calendarname.roc=calendari de la Rep\u00fablica de Xina
+FormatData/ca/field.dayperiod=a.m./p.m.
+FormatData/ca/field.era=era
+FormatData/ca/field.hour=hora
+FormatData/ca/field.minute=minut
+FormatData/ca/field.month=mes
+FormatData/ca/field.second=segon
+FormatData/ca/field.week=setmana
+FormatData/ca/field.weekday=dia de la setmana
+FormatData/ca/field.year=any
+FormatData/ca/field.zone=zona
+FormatData/cs/calendarname.buddhist=Buddhistick\u00fd kalend\u00e1\u0159
+FormatData/cs/calendarname.gregorian=Gregori\u00e1nsk\u00fd kalend\u00e1\u0159
+FormatData/cs/calendarname.gregory=Gregori\u00e1nsk\u00fd kalend\u00e1\u0159
+FormatData/cs/calendarname.islamic-civil=Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159
+FormatData/cs/calendarname.islamic=Muslimsk\u00fd kalend\u00e1\u0159
+FormatData/cs/calendarname.islamicc=Muslimsk\u00fd ob\u010dansk\u00fd kalend\u00e1\u0159
+FormatData/cs/calendarname.japanese=Japonsk\u00fd kalend\u00e1\u0159
+FormatData/cs/field.dayperiod=AM/PM
+FormatData/cs/field.hour=Hodina
+FormatData/cs/field.minute=Minuta
+FormatData/cs/field.month=M\u011bs\u00edc
+FormatData/cs/field.second=Sekunda
+FormatData/cs/field.week=T\u00fdden
+FormatData/cs/field.weekday=Den v t\u00fddnu
+FormatData/cs/field.year=Rok
+FormatData/cs/field.zone=\u010casov\u00e9 p\u00e1smo
+FormatData/da/calendarname.buddhist=buddhistisk kalender
+FormatData/da/calendarname.gregorian=gregoriansk kalender
+FormatData/da/calendarname.gregory=gregoriansk kalender
+FormatData/da/calendarname.islamic-civil=verdslig islamisk kalender
+FormatData/da/calendarname.islamic=islamisk kalender
+FormatData/da/calendarname.islamicc=verdslig islamisk kalender
+FormatData/da/calendarname.japanese=japansk kalender
+FormatData/da/calendarname.roc=kalender for Republikken Kina
+FormatData/da/field.dayperiod=dagtid
+FormatData/da/field.era=\u00e6ra
+FormatData/da/field.hour=time
+FormatData/da/field.minute=minut
+FormatData/da/field.month=m\u00e5ned
+FormatData/da/field.second=sekund
+FormatData/da/field.week=uge
+FormatData/da/field.weekday=ugedag
+FormatData/da/field.year=\u00e5r
+FormatData/da/field.zone=tidszone
+FormatData/da/roc.DatePatterns/0=EEEE d. MMMM y GGGG
+FormatData/da/roc.DatePatterns/1=d. MMMM y GGGG
+FormatData/da/roc.DatePatterns/2=d. MMM y GGGG
+FormatData/da/roc.DatePatterns/3=d/M/y G
+FormatData/da/islamic.DatePatterns/0=EEEE d. MMMM y GGGG
+FormatData/da/islamic.DatePatterns/1=d. MMMM y GGGG
+FormatData/da/islamic.DatePatterns/2=d. MMM y GGGG
+FormatData/da/islamic.DatePatterns/3=d/M/y GGGG
+FormatData/de/calendarname.buddhist=Buddhistischer Kalender
+FormatData/de/calendarname.gregorian=Gregorianischer Kalender
+FormatData/de/calendarname.gregory=Gregorianischer Kalender
+FormatData/de/calendarname.islamic-civil=B\u00fcrgerlicher islamischer Kalender
+FormatData/de/calendarname.islamic=Islamischer Kalender
+FormatData/de/calendarname.islamicc=B\u00fcrgerlicher islamischer Kalender
+FormatData/de/calendarname.japanese=Japanischer Kalender
+FormatData/de/calendarname.roc=Kalender der Republik China
+FormatData/de/field.dayperiod=Tagesh\u00e4lfte
+FormatData/de/field.era=Epoche
+FormatData/de/field.hour=Stunde
+FormatData/de/field.minute=Minute
+FormatData/de/field.month=Monat
+FormatData/de/field.second=Sekunde
+FormatData/de/field.week=Woche
+FormatData/de/field.weekday=Wochentag
+FormatData/de/field.year=Jahr
+FormatData/de/field.zone=Zone
+FormatData/de/roc.DatePatterns/0=EEEE d. MMMM y GGGG
+FormatData/de/roc.DatePatterns/1=d. MMMM y GGGG
+FormatData/de/roc.DatePatterns/2=d. MMM y GGGG
+FormatData/de/roc.DatePatterns/3=d.M.y G
+FormatData/de/islamic.DatePatterns/0=EEEE d. MMMM y GGGG
+FormatData/de/islamic.DatePatterns/1=d. MMMM y GGGG
+FormatData/de/islamic.DatePatterns/2=d. MMM y GGGG
+FormatData/de/islamic.DatePatterns/3=d.M.y GGGG
+FormatData/el/calendarname.buddhist=\u0392\u03bf\u03c5\u03b4\u03b9\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.gregorian=\u0393\u03c1\u03b7\u03b3\u03bf\u03c1\u03b9\u03b1\u03bd\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.gregory=\u0393\u03c1\u03b7\u03b3\u03bf\u03c1\u03b9\u03b1\u03bd\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.islamic-civil=\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.islamic=\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.islamicc=\u0399\u03c3\u03bb\u03b1\u03bc\u03b9\u03ba\u03cc \u03b1\u03c3\u03c4\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.japanese=\u0399\u03b1\u03c0\u03c9\u03bd\u03b9\u03ba\u03cc \u03b7\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf
+FormatData/el/calendarname.roc=\u0397\u03bc\u03b5\u03c1\u03bf\u03bb\u03cc\u03b3\u03b9\u03bf \u03c4\u03b7\u03c2 \u0394\u03b7\u03bc\u03bf\u03ba\u03c1\u03b1\u03c4\u03af\u03b1\u03c2 \u03c4\u03b7\u03c2 \u039a\u03af\u03bd\u03b1\u03c2
+FormatData/el/field.dayperiod=\u03c0.\u03bc./\u03bc.\u03bc.
+FormatData/el/field.era=\u03a0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf\u03c2
+FormatData/el/field.hour=\u038f\u03c1\u03b1
+FormatData/el/field.minute=\u039b\u03b5\u03c0\u03c4\u03cc
+FormatData/el/field.month=\u039c\u03ae\u03bd\u03b1\u03c2
+FormatData/el/field.second=\u0394\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03bf
+FormatData/el/field.week=\u0395\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1
+FormatData/el/field.weekday=\u0397\u03bc\u03ad\u03c1\u03b1 \u03b5\u03b2\u03b4\u03bf\u03bc\u03ac\u03b4\u03b1\u03c2
+FormatData/el/field.year=\u0388\u03c4\u03bf\u03c2
+FormatData/el/field.zone=\u0396\u03ce\u03bd\u03b7
+FormatData/el/roc.DatePatterns/0=EEEE, d MMMM, y GGGG
+FormatData/el/roc.DatePatterns/1=d MMMM, y GGGG
+FormatData/el/roc.DatePatterns/2=d MMM, y GGGG
+FormatData/el/roc.DatePatterns/3=d/M/y GGGG
+FormatData/es/calendarname.buddhist=calendario budista
+FormatData/es/calendarname.gregorian=calendario gregoriano
+FormatData/es/calendarname.gregory=calendario gregoriano
+FormatData/es/calendarname.islamic-civil=calendario civil isl\u00e1mico
+FormatData/es/calendarname.islamic=calendario isl\u00e1mico
+FormatData/es/calendarname.islamicc=calendario civil isl\u00e1mico
+FormatData/es/calendarname.japanese=calendario japon\u00e9s
+FormatData/es/calendarname.roc=calendario de la Rep\u00fablica de China
+FormatData/es/field.dayperiod=periodo del d\u00eda
+FormatData/es/field.era=era
+FormatData/es/field.hour=hora
+FormatData/es/field.minute=minuto
+FormatData/es/field.month=mes
+FormatData/es/field.second=segundo
+FormatData/es/field.week=semana
+FormatData/es/field.weekday=d\u00eda de la semana
+FormatData/es/field.year=a\u00f1o
+FormatData/es/field.zone=zona
+FormatData/es/roc.DatePatterns/0=EEEE, d 'de' MMMM 'de' y GGGG
+FormatData/es/roc.DatePatterns/1=d 'de' MMMM 'de' y GGGG
+FormatData/es/roc.DatePatterns/2=dd/MM/y GGGG
+FormatData/es/roc.DatePatterns/3=dd/MM/y G
+FormatData/es/islamic.DatePatterns/0=EEEE, d 'de' MMMM 'de' y GGGG
+FormatData/es/islamic.DatePatterns/1=d 'de' MMMM 'de' y GGGG
+FormatData/es/islamic.DatePatterns/2=dd/MM/y GGGG
+FormatData/es/islamic.DatePatterns/3=dd/MM/y GGGG
+FormatData/et/calendarname.buddhist=budistlik kalender
+FormatData/et/calendarname.gregorian=Gregoriuse kalender
+FormatData/et/calendarname.gregory=Gregoriuse kalender
+FormatData/et/calendarname.islamic-civil=islami ilmalik kalender
+FormatData/et/calendarname.islamic=islamikalender
+FormatData/et/calendarname.islamicc=islami ilmalik kalender
+FormatData/et/calendarname.japanese=Jaapani kalender
+FormatData/et/calendarname.roc=Hiina Vabariigi kalender
+FormatData/et/field.dayperiod=enne/p\u00e4rast l\u00f5unat
+FormatData/et/field.era=ajastu
+FormatData/et/field.hour=tund
+FormatData/et/field.minute=minut
+FormatData/et/field.month=kuu
+FormatData/et/field.second=sekund
+FormatData/et/field.week=n\u00e4dal
+FormatData/et/field.weekday=n\u00e4dalap\u00e4ev
+FormatData/et/field.year=aasta
+FormatData/et/field.zone=v\u00f6\u00f6nd
+FormatData/fi/calendarname.buddhist=buddhalainen kalenteri
+FormatData/fi/calendarname.gregorian=gregoriaaninen kalenteri
+FormatData/fi/calendarname.gregory=gregoriaaninen kalenteri
+FormatData/fi/calendarname.islamic-civil=islamilainen siviilikalenteri
+FormatData/fi/calendarname.islamic=islamilainen kalenteri
+FormatData/fi/calendarname.islamicc=islamilainen siviilikalenteri
+FormatData/fi/calendarname.japanese=japanilainen kalenteri
+FormatData/fi/calendarname.roc=Kiinan tasavallan kalenteri
+FormatData/fi/field.dayperiod=vuorokaudenaika
+FormatData/fi/field.era=aikakausi
+FormatData/fi/field.hour=tunti
+FormatData/fi/field.minute=minuutti
+FormatData/fi/field.month=kuukausi
+FormatData/fi/field.second=sekunti
+FormatData/fi/field.week=viikko
+FormatData/fi/field.weekday=viikonp\u00e4iv\u00e4
+FormatData/fi/field.year=vuosi
+FormatData/fi/field.zone=aikavy\u00f6hyke
+FormatData/fi/islamic.MonthNames/0=muharram
+FormatData/fi/islamic.MonthNames/1=safar
+FormatData/fi/islamic.MonthNames/2=rabi\u2019 al-awwal
+FormatData/fi/islamic.MonthNames/3=rabi\u2019 al-akhir
+FormatData/fi/islamic.MonthNames/4=d\u017eumada-l-ula
+FormatData/fi/islamic.MonthNames/5=d\u017eumada-l-akhira
+FormatData/fi/islamic.MonthNames/6=rad\u017eab
+FormatData/fi/islamic.MonthNames/7=\u0161a\u2019ban
+FormatData/fi/islamic.MonthNames/8=ramadan
+FormatData/fi/islamic.MonthNames/9=\u0161awwal
+FormatData/fi/islamic.MonthNames/10=dhu-l-qa\u2019da
+FormatData/fi/islamic.MonthNames/11=dhu-l-hidd\u017ea
+FormatData/fi/islamic.MonthNames/12=
+FormatData/fi/roc.DatePatterns/0=EEEE d. MMMM y GGGG
+FormatData/fi/roc.DatePatterns/1=d. MMMM y GGGG
+FormatData/fi/roc.DatePatterns/2=d.M.y GGGG
+FormatData/fi/roc.DatePatterns/3=d.M.y GGGG
+FormatData/fi/islamic.DatePatterns/0=EEEE d. MMMM y GGGG
+FormatData/fi/islamic.DatePatterns/1=d. MMMM y GGGG
+FormatData/fi/islamic.DatePatterns/2=d.M.y GGGG
+FormatData/fi/islamic.DatePatterns/3=d.M.y GGGG
+FormatData/fr/calendarname.buddhist=Calendrier bouddhiste
+FormatData/fr/calendarname.gregorian=Calendrier gr\u00e9gorien
+FormatData/fr/calendarname.gregory=Calendrier gr\u00e9gorien
+FormatData/fr/calendarname.islamic-civil=Calendrier civil musulman
+FormatData/fr/calendarname.islamic=Calendrier musulman
+FormatData/fr/calendarname.islamicc=Calendrier civil musulman
+FormatData/fr/calendarname.japanese=Calendrier japonais
+FormatData/fr/calendarname.roc=Calendrier r\u00e9publicain chinois
+FormatData/fr/field.dayperiod=cadran
+FormatData/fr/field.era=\u00e8re
+FormatData/fr/field.hour=heure
+FormatData/fr/field.minute=minute
+FormatData/fr/field.month=mois
+FormatData/fr/field.second=seconde
+FormatData/fr/field.week=semaine
+FormatData/fr/field.weekday=jour de la semaine
+FormatData/fr/field.year=ann\u00e9e
+FormatData/fr/field.zone=fuseau horaire
+FormatData/fr/islamic.MonthNames/0=Mouharram
+FormatData/fr/islamic.MonthNames/1=Safar
+FormatData/fr/islamic.MonthNames/2=Rabi\u02bb-oul-Aououal
+FormatData/fr/islamic.MonthNames/3=Rabi\u02bb-out-Tani
+FormatData/fr/islamic.MonthNames/4=Djoumada-l-Oula
+FormatData/fr/islamic.MonthNames/5=Djoumada-t-Tania
+FormatData/fr/islamic.MonthNames/6=Radjab
+FormatData/fr/islamic.MonthNames/7=Cha\u02bbban
+FormatData/fr/islamic.MonthNames/8=Ramadan
+FormatData/fr/islamic.MonthNames/9=Chaououal
+FormatData/fr/islamic.MonthNames/10=Dou-l-Qa\u02bbda
+FormatData/fr/islamic.MonthNames/11=Dou-l-Hidjja
+FormatData/fr/islamic.MonthNames/12=
+FormatData/fr/islamic.MonthAbbreviations/0=Mouh.
+FormatData/fr/islamic.MonthAbbreviations/1=Saf.
+FormatData/fr/islamic.MonthAbbreviations/2=Rabi\u02bb-oul-A.
+FormatData/fr/islamic.MonthAbbreviations/3=Rabi\u02bb-out-T.
+FormatData/fr/islamic.MonthAbbreviations/4=Djoum.-l-O.
+FormatData/fr/islamic.MonthAbbreviations/5=Djoum.-t-T.
+FormatData/fr/islamic.MonthAbbreviations/6=Radj.
+FormatData/fr/islamic.MonthAbbreviations/7=Cha.
+FormatData/fr/islamic.MonthAbbreviations/8=Ram.
+FormatData/fr/islamic.MonthAbbreviations/9=Chaou.
+FormatData/fr/islamic.MonthAbbreviations/10=Dou-l-Q.
+FormatData/fr/islamic.MonthAbbreviations/11=Dou-l-H.
+FormatData/fr/islamic.MonthAbbreviations/12=
+FormatData/fr/islamic.Eras/0=
+FormatData/fr/islamic.Eras/1=AH
+FormatData/fr/roc.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/fr/roc.DatePatterns/1=d MMMM y GGGG
+FormatData/fr/roc.DatePatterns/2=d MMM, y GGGG
+FormatData/fr/roc.DatePatterns/3=d/M/y G
+FormatData/fr/islamic.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/fr/islamic.DatePatterns/1=d MMMM y GGGG
+FormatData/fr/islamic.DatePatterns/2=d MMM, y GGGG
+FormatData/fr/islamic.DatePatterns/3=d/M/y GGGG
+FormatData/hi_IN/calendarname.buddhist=\u092c\u094c\u0926\u094d\u0927 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.gregorian=\u0917\u094d\u0930\u0947\u0917\u0930\u0940 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.gregory=\u0917\u094d\u0930\u0947\u0917\u0930\u0940 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.islamic-civil=\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u0928\u093e\u0917\u0930\u093f\u0915 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.islamic=\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.islamicc=\u0907\u0938\u094d\u0932\u093e\u092e\u0940 \u0928\u093e\u0917\u0930\u093f\u0915 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.japanese=\u091c\u093e\u092a\u093e\u0928\u0940 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/calendarname.roc=\u091a\u0940\u0928\u0940 \u0917\u0923\u0924\u0902\u0924\u094d\u0930 \u092a\u0902\u091a\u093e\u0902\u0917
+FormatData/hi_IN/field.dayperiod=\u0938\u092e\u092f \u0905\u0935\u0927\u093f
+FormatData/hi_IN/field.era=\u092f\u0941\u0917
+FormatData/hi_IN/field.hour=\u0918\u0902\u091f\u093e
+FormatData/hi_IN/field.minute=\u092e\u093f\u0928\u091f
+FormatData/hi_IN/field.month=\u092e\u093e\u0938
+FormatData/hi_IN/field.second=\u0938\u0947\u0915\u0947\u0902\u0921
+FormatData/hi_IN/field.week=\u0938\u092a\u094d\u0924\u093e\u0939
+FormatData/hi_IN/field.weekday=\u0938\u092a\u094d\u0924\u093e\u0939 \u0915\u093e \u0926\u093f\u0928
+FormatData/hi_IN/field.year=\u0935\u0930\u094d\u0937
+FormatData/hi_IN/field.zone=\u0915\u094d\u0937\u0947\u0924\u094d\u0930
+FormatData/hr/calendarname.buddhist=budisti\u010dki kalendar
+FormatData/hr/calendarname.gregorian=gregorijanski kalendar
+FormatData/hr/calendarname.gregory=gregorijanski kalendar
+FormatData/hr/calendarname.islamic-civil=islamski civilni kalendar
+FormatData/hr/calendarname.islamic=islamski kalendar
+FormatData/hr/calendarname.islamicc=islamski civilni kalendar
+FormatData/hr/calendarname.japanese=japanski kalendar
+FormatData/hr/calendarname.roc=kalendar Republike Kine
+FormatData/hr/field.dayperiod=dio dana
+FormatData/hr/field.era=era
+FormatData/hr/field.hour=sat
+FormatData/hr/field.minute=minuta
+FormatData/hr/field.month=mjesec
+FormatData/hr/field.second=sekunda
+FormatData/hr/field.week=tjedan
+FormatData/hr/field.weekday=dan u tjednu
+FormatData/hr/field.year=godina
+FormatData/hr/field.zone=zona
+FormatData/hr/roc.DatePatterns/0=EEEE, d. MMMM y. GGGG
+FormatData/hr/roc.DatePatterns/1=d. MMMM y. GGGG
+FormatData/hr/roc.DatePatterns/2=d. M. y. GGGG
+FormatData/hr/roc.DatePatterns/3=d.M.y. GGGG
+FormatData/hu/calendarname.buddhist=buddhista napt\u00e1r
+FormatData/hu/calendarname.gregorian=Gergely-napt\u00e1r
+FormatData/hu/calendarname.gregory=Gergely-napt\u00e1r
+FormatData/hu/calendarname.islamic-civil=iszl\u00e1m civil napt\u00e1r
+FormatData/hu/calendarname.islamic=iszl\u00e1m napt\u00e1r
+FormatData/hu/calendarname.islamicc=iszl\u00e1m civil napt\u00e1r
+FormatData/hu/calendarname.japanese=jap\u00e1n napt\u00e1r
+FormatData/hu/calendarname.roc=K\u00ednai k\u00f6zt\u00e1rsas\u00e1gi napt\u00e1r
+FormatData/hu/field.dayperiod=napszak
+FormatData/hu/field.era=\u00e9ra
+FormatData/hu/field.hour=\u00f3ra
+FormatData/hu/field.minute=perc
+FormatData/hu/field.month=h\u00f3nap
+FormatData/hu/field.second=m\u00e1sodperc
+FormatData/hu/field.week=h\u00e9t
+FormatData/hu/field.weekday=h\u00e9t napja
+FormatData/hu/field.year=\u00e9v
+FormatData/hu/field.zone=z\u00f3na
+FormatData/hu/islamic.MonthNames/0=Moharrem
+FormatData/hu/islamic.MonthNames/1=Safar
+FormatData/hu/islamic.MonthNames/2=R\u00e9bi el avvel
+FormatData/hu/islamic.MonthNames/3=R\u00e9bi el accher
+FormatData/hu/islamic.MonthNames/4=Dsem\u00e1di el avvel
+FormatData/hu/islamic.MonthNames/5=Dsem\u00e1di el accher
+FormatData/hu/islamic.MonthNames/6=Redseb
+FormatData/hu/islamic.MonthNames/7=Sab\u00e1n
+FormatData/hu/islamic.MonthNames/8=Ramad\u00e1n
+FormatData/hu/islamic.MonthNames/9=Sevv\u00e1l
+FormatData/hu/islamic.MonthNames/10=Ds\u00fcl kade
+FormatData/hu/islamic.MonthNames/11=Ds\u00fcl hedse
+FormatData/hu/islamic.MonthNames/12=
+FormatData/hu/islamic.Eras/0=
+FormatData/hu/islamic.Eras/1=MF
+FormatData/is/calendarname.buddhist=B\u00fadd\u00edskt dagatal
+FormatData/is/calendarname.gregorian=Gregor\u00edskt dagatal
+FormatData/is/calendarname.gregory=Gregor\u00edskt dagatal
+FormatData/is/calendarname.islamic-civil=\u00cdslamskt borgaradagatal
+FormatData/is/calendarname.islamic=\u00cdslamskt dagatal
+FormatData/is/calendarname.islamicc=\u00cdslamskt borgaradagatal
+FormatData/is/calendarname.japanese=Japanskt dagatal
+FormatData/it/calendarname.buddhist=calendario buddista
+FormatData/it/calendarname.gregorian=calendario gregoriano
+FormatData/it/calendarname.gregory=calendario gregoriano
+FormatData/it/calendarname.islamic-civil=calendario civile islamico
+FormatData/it/calendarname.islamic=calendario islamico
+FormatData/it/calendarname.islamicc=calendario civile islamico
+FormatData/it/calendarname.japanese=calendario giapponese
+FormatData/it/field.dayperiod=periodo del giorno
+FormatData/it/field.era=era
+FormatData/it/field.hour=ora
+FormatData/it/field.minute=minuto
+FormatData/it/field.month=mese
+FormatData/it/field.second=secondo
+FormatData/it/field.week=settimana
+FormatData/it/field.weekday=giorno della settimana
+FormatData/it/field.year=anno
+FormatData/it/field.zone=zona
+FormatData/it/roc.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/it/roc.DatePatterns/1=dd MMMM y GGGG
+FormatData/it/roc.DatePatterns/2=dd/MMM/y GGGG
+FormatData/it/roc.DatePatterns/3=dd/MM/y GGGG
+FormatData/it/islamic.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/it/islamic.DatePatterns/1=dd MMMM y GGGG
+FormatData/it/islamic.DatePatterns/2=dd/MMM/y GGGG
+FormatData/it/islamic.DatePatterns/3=dd/MM/y GGGG
+FormatData/iw/calendarname.buddhist=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d1\u05d5\u05d3\u05d4\u05d9\u05e1\u05d8\u05d9
+FormatData/iw/calendarname.gregorian=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9
+FormatData/iw/calendarname.gregory=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d2\u05e8\u05d2\u05d5\u05e8\u05d9\u05d0\u05e0\u05d9
+FormatData/iw/calendarname.islamic-civil=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9
+FormatData/iw/calendarname.islamic=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9
+FormatData/iw/calendarname.islamicc=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05de\u05d5\u05e1\u05dc\u05de\u05d9-\u05d0\u05d6\u05e8\u05d7\u05d9
+FormatData/iw/calendarname.japanese=\u05dc\u05d5\u05d7 \u05e9\u05e0\u05d4 \u05d9\u05e4\u05e0\u05d9
+FormatData/iw/field.dayperiod=\u05dc\u05e4\u05d4\u05f4\u05e6/\u05d0\u05d7\u05d4\u05f4\u05e6
+FormatData/iw/field.era=\u05ea\u05e7\u05d5\u05e4\u05d4
+FormatData/iw/field.hour=\u05e9\u05e2\u05d4
+FormatData/iw/field.minute=\u05d3\u05e7\u05d4
+FormatData/iw/field.month=\u05d7\u05d5\u05d3\u05e9
+FormatData/iw/field.second=\u05e9\u05e0\u05d9\u05d9\u05d4
+FormatData/iw/field.week=\u05e9\u05d1\u05d5\u05e2
+FormatData/iw/field.weekday=\u05d9\u05d5\u05dd \u05d1\u05e9\u05d1\u05d5\u05e2
+FormatData/iw/field.year=\u05e9\u05e0\u05d4
+FormatData/iw/field.zone=\u05d0\u05d6\u05d5\u05e8
+FormatData/iw/islamic.MonthNames/0=\u05de\u05d5\u05d7\u05e8\u05dd
+FormatData/iw/islamic.MonthNames/1=\u05e1\u05e4\u05e8
+FormatData/iw/islamic.MonthNames/2=\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc
+FormatData/iw/islamic.MonthNames/3=\u05e8\u05d1\u05d9\u05e2 \u05d0\u05dc-\u05ea\u05e0\u05d9
+FormatData/iw/islamic.MonthNames/4=\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05d0\u05d5\u05d5\u05d0\u05dc
+FormatData/iw/islamic.MonthNames/5=\u05d2\u05f3\u05d5\u05de\u05d3\u05d4 \u05d0\u05dc-\u05ea\u05e0\u05d9
+FormatData/iw/islamic.MonthNames/6=\u05e8\u05d2\u05f3\u05d0\u05d1
+FormatData/iw/islamic.MonthNames/7=\u05e9\u05e2\u05d1\u05d0\u05df
+FormatData/iw/islamic.MonthNames/8=\u05e8\u05d0\u05de\u05d3\u05df
+FormatData/iw/islamic.MonthNames/9=\u05e9\u05d5\u05d5\u05d0\u05dc
+FormatData/iw/islamic.MonthNames/10=\u05d6\u05d5 \u05d0\u05dc-QI'DAH
+FormatData/iw/islamic.MonthNames/11=\u05d6\u05d5 \u05d0\u05dc-\u05d7\u05d9\u05d2\u05f3\u05d4
+FormatData/iw/islamic.MonthNames/12=
+FormatData/iw/islamic.Eras/0=
+FormatData/iw/islamic.Eras/1=\u05e9\u05e0\u05ea \u05d4\u05d9\u05d2\u05f3\u05e8\u05d4
+FormatData/ja/calendarname.buddhist=\u30bf\u30a4\u4ecf\u6559\u66a6
+FormatData/ja/calendarname.gregorian=\u897f\u66a6[\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6]
+FormatData/ja/calendarname.gregory=\u897f\u66a6[\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6]
+FormatData/ja/calendarname.islamic-civil=\u592a\u967d\u30a4\u30b9\u30e9\u30e0\u66a6
+FormatData/ja/calendarname.islamic=\u30a4\u30b9\u30e9\u30e0\u66a6
+FormatData/ja/calendarname.islamicc=\u592a\u967d\u30a4\u30b9\u30e9\u30e0\u66a6
+FormatData/ja/calendarname.japanese=\u548c\u66a6
+FormatData/ja/calendarname.roc=\u4e2d\u83ef\u6c11\u56fd\u66a6
+FormatData/ja/field.dayperiod=\u5348\u524d/\u5348\u5f8c
+FormatData/ja/field.era=\u6642\u4ee3
+FormatData/ja/field.hour=\u6642
+FormatData/ja/field.minute=\u5206
+FormatData/ja/field.month=\u6708
+FormatData/ja/field.second=\u79d2
+FormatData/ja/field.week=\u9031
+FormatData/ja/field.weekday=\u66dc\u65e5
+FormatData/ja/field.year=\u5e74
+FormatData/ja/field.zone=\u30bf\u30a4\u30e0\u30be\u30fc\u30f3
+FormatData/ja/roc.DatePatterns/0=GGGGy\u5e74M\u6708d\u65e5EEEE
+FormatData/ja/roc.DatePatterns/1=GGGGy\u5e74M\u6708d\u65e5
+FormatData/ja/roc.DatePatterns/2=GGGGy/MM/dd
+FormatData/ja/roc.DatePatterns/3=GGGGy/MM/dd
+FormatData/ko/calendarname.buddhist=\ubd88\uad50\ub825
+FormatData/ko/calendarname.gregorian=\ud0dc\uc591\ub825
+FormatData/ko/calendarname.gregory=\ud0dc\uc591\ub825
+FormatData/ko/calendarname.islamic-civil=\uc774\uc2ac\ub78c \uc0c1\uc6a9\ub825
+FormatData/ko/calendarname.islamic=\uc774\uc2ac\ub78c\ub825
+FormatData/ko/calendarname.islamicc=\uc774\uc2ac\ub78c \uc0c1\uc6a9\ub825
+FormatData/ko/calendarname.japanese=\uc77c\ubcf8\ub825
+FormatData/ko/calendarname.roc=\ub300\ub9cc\ub825
+FormatData/ko/field.dayperiod=\uc624\uc804/\uc624\ud6c4
+FormatData/ko/field.era=\uc5f0\ud638
+FormatData/ko/field.hour=\uc2dc
+FormatData/ko/field.minute=\ubd84
+FormatData/ko/field.month=\uc6d4
+FormatData/ko/field.second=\ucd08
+FormatData/ko/field.week=\uc8fc
+FormatData/ko/field.weekday=\uc694\uc77c
+FormatData/ko/field.year=\ub144
+FormatData/ko/field.zone=\uc2dc\uac04\ub300
+FormatData/ko/roc.DatePatterns/0=GGGG y\ub144 M\uc6d4 d\uc77c EEEE
+FormatData/ko/roc.DatePatterns/1=GGGG y\ub144 M\uc6d4 d\uc77c
+FormatData/ko/roc.DatePatterns/2=GGGG y. M. d
+FormatData/ko/roc.DatePatterns/3=GGGG y. M. d
+FormatData/lt/calendarname.buddhist=Budist\u0173 kalendorius
+FormatData/lt/calendarname.gregorian=Grigaliaus kalendorius
+FormatData/lt/calendarname.gregory=Grigaliaus kalendorius
+FormatData/lt/calendarname.islamic-civil=Pilietinis islamo kalendorius
+FormatData/lt/calendarname.islamic=Islamo kalendorius
+FormatData/lt/calendarname.islamicc=Pilietinis islamo kalendorius
+FormatData/lt/calendarname.japanese=Japon\u0173 kalendorius
+FormatData/lt/calendarname.roc=Kinijos Respublikos kalendorius
+FormatData/lt/field.dayperiod=dienos metas
+FormatData/lt/field.era=era
+FormatData/lt/field.hour=valanda
+FormatData/lt/field.minute=minut\u0117
+FormatData/lt/field.month=m\u0117nuo
+FormatData/lt/field.second=sekund\u0117
+FormatData/lt/field.week=savait\u0117
+FormatData/lt/field.weekday=savait\u0117s diena
+FormatData/lt/field.year=metai
+FormatData/lt/field.zone=laiko juosta
+FormatData/lv/calendarname.buddhist=budistu kalend\u0101rs
+FormatData/lv/calendarname.gregorian=Gregora kalend\u0101rs
+FormatData/lv/calendarname.gregory=Gregora kalend\u0101rs
+FormatData/lv/calendarname.islamic-civil=isl\u0101ma pilso\u0146u kalend\u0101rs
+FormatData/lv/calendarname.islamic=isl\u0101ma kalend\u0101rs
+FormatData/lv/calendarname.islamicc=isl\u0101ma pilso\u0146u kalend\u0101rs
+FormatData/lv/calendarname.japanese=jap\u0101\u0146u kalend\u0101rs
+FormatData/lv/calendarname.roc=\u0136\u012bnas Republikas kalend\u0101rs
+FormatData/lv/field.dayperiod=Dayperiod
+FormatData/lv/field.era=\u0113ra
+FormatData/lv/field.hour=Stundas
+FormatData/lv/field.minute=Min\u016btes
+FormatData/lv/field.month=M\u0113nesis
+FormatData/lv/field.second=Sekundes
+FormatData/lv/field.week=Ned\u0113\u013ca
+FormatData/lv/field.weekday=Ned\u0113\u013cas diena
+FormatData/lv/field.year=Gads
+FormatData/lv/field.zone=Josla
+FormatData/lv/islamic.MonthNames/0=muharams
+FormatData/lv/islamic.MonthNames/1=safars
+FormatData/lv/islamic.MonthNames/2=1. rab\u012b
+FormatData/lv/islamic.MonthNames/3=2. rab\u012b
+FormatData/lv/islamic.MonthNames/4=1. d\u017eum\u0101d\u0101
+FormatData/lv/islamic.MonthNames/5=2. d\u017eum\u0101d\u0101
+FormatData/lv/islamic.MonthNames/6=rad\u017eabs
+FormatData/lv/islamic.MonthNames/7=\u0161abans
+FormatData/lv/islamic.MonthNames/8=ramad\u0101ns
+FormatData/lv/islamic.MonthNames/9=\u0161auvals
+FormatData/lv/islamic.MonthNames/10=du al-kid\u0101
+FormatData/lv/islamic.MonthNames/11=du al-hid\u017e\u0101
+FormatData/lv/islamic.MonthNames/12=
+FormatData/mk/calendarname.buddhist=\u0411\u0443\u0434\u0438\u0441\u0442\u0438\u0447\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.gregorian=\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.gregory=\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.islamic-civil=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0433\u0440\u0430\u0453\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.islamic=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.islamicc=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0433\u0440\u0430\u0453\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.japanese=\u0408\u0430\u043f\u043e\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/mk/calendarname.roc=\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u043d\u0430 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041a\u0438\u043d\u0430
+FormatData/mk/field.dayperiod=\u043f\u0440\u0435\u0442\u043f\u043b\u0430\u0434\u043d\u0435/\u043f\u043e\u043f\u043b\u0430\u0434\u043d\u0435
+FormatData/mk/field.era=\u0415\u0440\u0430
+FormatData/mk/field.hour=\u0427\u0430\u0441
+FormatData/mk/field.minute=\u041c\u0438\u043d\u0443\u0442\u0430
+FormatData/mk/field.month=\u041c\u0435\u0441\u0435\u0446
+FormatData/mk/field.second=\u0421\u0435\u043a\u0443\u043d\u0434\u0430
+FormatData/mk/field.week=\u041d\u0435\u0434\u0435\u043b\u0430
+FormatData/mk/field.weekday=\u0414\u0435\u043d \u0432\u043e \u043d\u0435\u0434\u0435\u043b\u0430\u0442\u0430
+FormatData/mk/field.year=\u0433\u043e\u0434\u0438\u043d\u0430
+FormatData/mk/field.zone=\u0437\u043e\u043d\u0430
+FormatData/ms/calendarname.buddhist=Kalendar Buddha
+FormatData/ms/calendarname.gregorian=Kalendar Gregory
+FormatData/ms/calendarname.gregory=Kalendar Gregory
+FormatData/ms/calendarname.islamic-civil=Kalendar Sivil Islam
+FormatData/ms/calendarname.islamic=Kalendar Islam
+FormatData/ms/calendarname.islamicc=Kalendar Sivil Islam
+FormatData/ms/calendarname.japanese=Kalendar Jepun
+FormatData/ms/calendarname.roc=Kalendar Minguo
+FormatData/ms/field.dayperiod=PG/PTG
+FormatData/ms/field.hour=Jam
+FormatData/ms/field.minute=Minit
+FormatData/ms/field.month=Bulan
+FormatData/ms/field.second=Kedua
+FormatData/ms/field.week=Minggu
+FormatData/ms/field.weekday=Hari dalam Minggu
+FormatData/ms/field.year=Tahun
+FormatData/ms/field.zone=Zon Waktu
+FormatData/ms/roc.DatePatterns/0=EEEE, d MMMM y GGGG
+FormatData/ms/roc.DatePatterns/1=d MMMM y GGGG
+FormatData/ms/roc.DatePatterns/2=dd/MM/y GGGG
+FormatData/ms/roc.DatePatterns/3=d/MM/y GGGG
+FormatData/ms/islamic.DatePatterns/0=EEEE, d MMMM y GGGG
+FormatData/ms/islamic.DatePatterns/1=d MMMM y GGGG
+FormatData/ms/islamic.DatePatterns/2=dd/MM/y GGGG
+FormatData/ms/islamic.DatePatterns/3=d/MM/y GGGG
+FormatData/mt/calendarname.buddhist=Kalendarju Buddist
+FormatData/mt/calendarname.gregorian=Kalendarju Gregorjan
+FormatData/mt/calendarname.gregory=Kalendarju Gregorjan
+FormatData/mt/calendarname.islamic-civil=Kalendarju Islamiku-\u010aivili
+FormatData/mt/calendarname.islamic=Kalendarju Islamiku
+FormatData/mt/calendarname.islamicc=Kalendarju Islamiku-\u010aivili
+FormatData/mt/calendarname.japanese=Kalendarju \u0120appuni\u017c
+FormatData/mt/field.era=Epoka
+FormatData/mt/field.hour=Sieg\u0127a
+FormatData/mt/field.minute=Minuta
+FormatData/mt/field.month=Xahar
+FormatData/mt/field.second=Sekonda
+FormatData/mt/field.week=\u0120img\u0127a
+FormatData/mt/field.weekday=Jum tal-\u0120img\u0127a
+FormatData/mt/field.year=Sena
+FormatData/mt/field.zone=\u017bona
+FormatData/nl/calendarname.buddhist=Boeddhistische kalender
+FormatData/nl/calendarname.gregorian=Gregoriaanse kalender
+FormatData/nl/calendarname.gregory=Gregoriaanse kalender
+FormatData/nl/calendarname.islamic-civil=Islamitische kalender (cyclisch)
+FormatData/nl/calendarname.islamic=Islamitische kalender
+FormatData/nl/calendarname.islamicc=Islamitische kalender (cyclisch)
+FormatData/nl/calendarname.japanese=Japanse kalender
+FormatData/nl/calendarname.roc=Kalender van de Chinese Republiek
+FormatData/nl/field.dayperiod=AM/PM
+FormatData/nl/field.era=Tijdperk
+FormatData/nl/field.hour=Uur
+FormatData/nl/field.minute=Minuut
+FormatData/nl/field.month=Maand
+FormatData/nl/field.second=Seconde
+FormatData/nl/field.weekday=Dag van de week
+FormatData/nl/field.year=Jaar
+FormatData/nl/field.zone=Zone
+FormatData/nl/islamic.MonthNames/0=Moeharram
+FormatData/nl/islamic.MonthNames/1=Safar
+FormatData/nl/islamic.MonthNames/2=Rabi\u02bba al awal
+FormatData/nl/islamic.MonthNames/3=Rabi\u02bba al thani
+FormatData/nl/islamic.MonthNames/4=Joemad\u02bbal awal
+FormatData/nl/islamic.MonthNames/5=Joemad\u02bbal thani
+FormatData/nl/islamic.MonthNames/6=Rajab
+FormatData/nl/islamic.MonthNames/7=Sja\u02bbaban
+FormatData/nl/islamic.MonthNames/8=Ramadan
+FormatData/nl/islamic.MonthNames/9=Sjawal
+FormatData/nl/islamic.MonthNames/10=Doe al ka\u02bbaba
+FormatData/nl/islamic.MonthNames/11=Doe al hizja
+FormatData/nl/islamic.MonthNames/12=
+FormatData/nl/islamic.MonthAbbreviations/0=Moeh.
+FormatData/nl/islamic.MonthAbbreviations/1=Saf.
+FormatData/nl/islamic.MonthAbbreviations/2=Rab. I
+FormatData/nl/islamic.MonthAbbreviations/3=Rab. II
+FormatData/nl/islamic.MonthAbbreviations/4=Joem. I
+FormatData/nl/islamic.MonthAbbreviations/5=Joem. II
+FormatData/nl/islamic.MonthAbbreviations/6=Raj.
+FormatData/nl/islamic.MonthAbbreviations/7=Sja.
+FormatData/nl/islamic.MonthAbbreviations/8=Ram.
+FormatData/nl/islamic.MonthAbbreviations/9=Sjaw.
+FormatData/nl/islamic.MonthAbbreviations/10=Doe al k.
+FormatData/nl/islamic.MonthAbbreviations/11=Doe al h.
+FormatData/nl/islamic.MonthAbbreviations/12=
+FormatData/nl/islamic.Eras/0=
+FormatData/nl/islamic.Eras/1=Sa\u02bbna Hizjria
+FormatData/nl/roc.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/nl/roc.DatePatterns/1=d MMMM y GGGG
+FormatData/nl/roc.DatePatterns/2=d MMM y GGGG
+FormatData/nl/roc.DatePatterns/3=dd-MM-yy G
+FormatData/nl/islamic.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/nl/islamic.DatePatterns/1=d MMMM y GGGG
+FormatData/nl/islamic.DatePatterns/2=d MMM y GGGG
+FormatData/nl/islamic.DatePatterns/3=dd-MM-yy GGGG
+FormatData/pl/calendarname.buddhist=kalendarz buddyjski
+FormatData/pl/calendarname.gregorian=kalendarz gregoria\u0144ski
+FormatData/pl/calendarname.gregory=kalendarz gregoria\u0144ski
+FormatData/pl/calendarname.islamic-civil=kalendarz islamski (metoda obliczeniowa)
+FormatData/pl/calendarname.islamic=kalendarz islamski (metoda wzrokowa)
+FormatData/pl/calendarname.islamicc=kalendarz islamski (metoda obliczeniowa)
+FormatData/pl/calendarname.japanese=kalendarz japo\u0144ski
+FormatData/pl/calendarname.roc=kalendarz Republiki Chi\u0144skiej
+FormatData/pl/field.era=Era
+FormatData/pl/field.hour=Godzina
+FormatData/pl/field.minute=Minuta
+FormatData/pl/field.month=Miesi\u0105c
+FormatData/pl/field.second=Sekunda
+FormatData/pl/field.week=Tydzie\u0144
+FormatData/pl/field.weekday=Dzie\u0144 tygodnia
+FormatData/pl/field.year=Rok
+FormatData/pl/field.zone=Strefa
+FormatData/pl/roc.DatePatterns/0=EEEE, d MMMM, y GGGG
+FormatData/pl/roc.DatePatterns/1=d MMMM, y GGGG
+FormatData/pl/roc.DatePatterns/2=d MMM y GGGG
+FormatData/pl/roc.DatePatterns/3=dd.MM.yyyy GGGG
+FormatData/pl/islamic.DatePatterns/0=EEEE, d MMMM, y GGGG
+FormatData/pl/islamic.DatePatterns/1=d MMMM, y GGGG
+FormatData/pl/islamic.DatePatterns/2=d MMM y GGGG
+FormatData/pl/islamic.DatePatterns/3=dd.MM.yyyy GGGG
+FormatData/pt/calendarname.buddhist=Calend\u00e1rio Budista
+FormatData/pt/calendarname.gregorian=Calend\u00e1rio Gregoriano
+FormatData/pt/calendarname.gregory=Calend\u00e1rio Gregoriano
+FormatData/pt/calendarname.islamic-civil=Calend\u00e1rio Civil Isl\u00e2mico
+FormatData/pt/calendarname.islamic=Calend\u00e1rio Isl\u00e2mico
+FormatData/pt/calendarname.islamicc=Calend\u00e1rio Civil Isl\u00e2mico
+FormatData/pt/calendarname.japanese=Calend\u00e1rio Japon\u00eas
+FormatData/pt/calendarname.roc=Calend\u00e1rio da Rep\u00fablica da China
+FormatData/pt/field.dayperiod=Per\u00edodo do dia
+FormatData/pt/field.era=Era
+FormatData/pt/field.hour=Hora
+FormatData/pt/field.minute=Minuto
+FormatData/pt/field.month=M\u00eas
+FormatData/pt/field.second=Segundo
+FormatData/pt/field.week=Semana
+FormatData/pt/field.weekday=Dia da semana
+FormatData/pt/field.year=Ano
+FormatData/pt/field.zone=Fuso
+FormatData/pt/roc.DatePatterns/0=EEEE, d 'de' MMMM 'de' y GGGG
+FormatData/pt/roc.DatePatterns/1=d 'de' MMMM 'de' y GGGG
+FormatData/pt/roc.DatePatterns/2=dd/MM/yyyy GGGG
+FormatData/pt/roc.DatePatterns/3=d/M/yyyy
+FormatData/pt/islamic.DatePatterns/0=EEEE, d 'de' MMMM 'de' y GGGG
+FormatData/pt/islamic.DatePatterns/1=d 'de' MMMM 'de' y GGGG
+FormatData/pt/islamic.DatePatterns/2=dd/MM/yyyy GGGG
+FormatData/pt/islamic.DatePatterns/3=d/M/yyyy
+FormatData/ro/calendarname.buddhist=calendar budist
+FormatData/ro/calendarname.gregorian=calendar gregorian
+FormatData/ro/calendarname.gregory=calendar gregorian
+FormatData/ro/calendarname.islamic-civil=calendar islamic civil
+FormatData/ro/calendarname.islamic=calendar islamic
+FormatData/ro/calendarname.islamicc=calendar islamic civil
+FormatData/ro/calendarname.japanese=calendar japonez
+FormatData/ro/calendarname.roc=calendar al Republicii Chineze
+FormatData/ro/field.dayperiod=perioada zilei
+FormatData/ro/field.era=er\u0103
+FormatData/ro/field.hour=or\u0103
+FormatData/ro/field.minute=minut
+FormatData/ro/field.month=lun\u0103
+FormatData/ro/field.second=secund\u0103
+FormatData/ro/field.week=s\u0103pt\u0103m\u00e2n\u0103
+FormatData/ro/field.weekday=zi a s\u0103pt\u0103m\u00e2nii
+FormatData/ro/field.year=an
+FormatData/ro/field.zone=zon\u0103
+FormatData/ru/calendarname.buddhist=\u0411\u0443\u0434\u0434\u0438\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.gregorian=\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.gregory=\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.islamic-civil=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.islamic=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.islamicc=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.japanese=\u042f\u043f\u043e\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/calendarname.roc=\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c
+FormatData/ru/field.era=\u042d\u0440\u0430
+FormatData/ru/field.hour=\u0427\u0430\u0441
+FormatData/ru/field.minute=\u041c\u0438\u043d\u0443\u0442\u0430
+FormatData/ru/field.month=\u041c\u0435\u0441\u044f\u0446
+FormatData/ru/field.second=\u0421\u0435\u043a\u0443\u043d\u0434\u0430
+FormatData/ru/field.week=\u041d\u0435\u0434\u0435\u043b\u044f
+FormatData/ru/field.weekday=\u0414\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438
+FormatData/ru/field.year=\u0413\u043e\u0434
+FormatData/ru/field.zone=\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441
+FormatData/ru/islamic.MonthNames/0=\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c
+FormatData/ru/islamic.MonthNames/1=\u0421\u0430\u0444\u0430\u0440
+FormatData/ru/islamic.MonthNames/2=\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c
+FormatData/ru/islamic.MonthNames/3=\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0445\u0438\u0440
+FormatData/ru/islamic.MonthNames/4=\u0414\u0436\u0443\u043c\u0430\u0434-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c
+FormatData/ru/islamic.MonthNames/5=\u0414\u0436\u0443\u043c\u0430\u0434-\u0443\u043b\u044c-\u0430\u0445\u0438\u0440
+FormatData/ru/islamic.MonthNames/6=\u0420\u0430\u0434\u0436\u0430\u0431
+FormatData/ru/islamic.MonthNames/7=\u0428\u0430\u0430\u0431\u0430\u043d
+FormatData/ru/islamic.MonthNames/8=\u0420\u0430\u043c\u0430\u0434\u0430\u043d
+FormatData/ru/islamic.MonthNames/9=\u0428\u0430\u0432\u0432\u0430\u043b\u044c
+FormatData/ru/islamic.MonthNames/10=\u0417\u0443\u043b\u044c-\u041a\u0430\u0430\u0434\u0430
+FormatData/ru/islamic.MonthNames/11=\u0417\u0443\u043b\u044c-\u0425\u0438\u0434\u0436\u0436\u0430
+FormatData/ru/islamic.MonthNames/12=
+FormatData/ru/roc.DatePatterns/0=EEEE, d MMMM y\u00a0'\u0433'. GGGG
+FormatData/ru/roc.DatePatterns/1=d MMMM y\u00a0'\u0433'. GGGG
+FormatData/ru/roc.DatePatterns/2=dd.MM.yyyy GGGG
+FormatData/ru/roc.DatePatterns/3=dd.MM.yy GGGG
+FormatData/ru/islamic.DatePatterns/0=EEEE, d MMMM y\u00a0'\u0433'. GGGG
+FormatData/ru/islamic.DatePatterns/1=d MMMM y\u00a0'\u0433'. GGGG
+FormatData/ru/islamic.DatePatterns/2=dd.MM.yyyy GGGG
+FormatData/ru/islamic.DatePatterns/3=dd.MM.yy GGGG
+FormatData/sk/calendarname.buddhist=Buddhistick\u00fd kalend\u00e1r
+FormatData/sk/calendarname.gregorian=Gregori\u00e1nsky kalend\u00e1r
+FormatData/sk/calendarname.gregory=Gregori\u00e1nsky kalend\u00e1r
+FormatData/sk/calendarname.islamic-civil=Islamsk\u00fd ob\u010diansky kalend\u00e1r
+FormatData/sk/calendarname.islamic=Islamsk\u00fd kalend\u00e1r
+FormatData/sk/calendarname.islamicc=Islamsk\u00fd ob\u010diansky kalend\u00e1r
+FormatData/sk/calendarname.japanese=Japonsk\u00fd kalend\u00e1r
+FormatData/sk/field.dayperiod=\u010cas\u0165 d\u0148a
+FormatData/sk/field.era=\u00c9ra
+FormatData/sk/field.hour=Hodina
+FormatData/sk/field.minute=Min\u00fata
+FormatData/sk/field.month=Mesiac
+FormatData/sk/field.second=Sekunda
+FormatData/sk/field.week=T\u00fd\u017ede\u0148
+FormatData/sk/field.weekday=De\u0148 v t\u00fd\u017edni
+FormatData/sk/field.year=Rok
+FormatData/sk/field.zone=P\u00e1smo
+FormatData/sl/calendarname.buddhist=budisti\u010dni koledar
+FormatData/sl/calendarname.gregorian=gregorijanski koledar
+FormatData/sl/calendarname.gregory=gregorijanski koledar
+FormatData/sl/calendarname.islamic-civil=islamski civilni koledar
+FormatData/sl/calendarname.islamic=islamski koledar
+FormatData/sl/calendarname.islamicc=islamski civilni koledar
+FormatData/sl/calendarname.japanese=japonski koledar
+FormatData/sl/calendarname.roc=kitajski dr\u017eavni koledar
+FormatData/sl/field.dayperiod=\u010cas dneva
+FormatData/sl/field.era=Doba
+FormatData/sl/field.hour=Ura
+FormatData/sl/field.minute=Minuta
+FormatData/sl/field.month=Mesec
+FormatData/sl/field.second=Sekunda
+FormatData/sl/field.week=Teden
+FormatData/sl/field.weekday=Dan v tednu
+FormatData/sl/field.year=Leto
+FormatData/sl/field.zone=Obmo\u010dje
+FormatData/sr/calendarname.buddhist=\u0411\u0443\u0434\u0438\u0441\u0442\u0438\u0447\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.gregorian=\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.gregory=\u0413\u0440\u0435\u0433\u043e\u0440\u0438\u0458\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.islamic-civil=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u043d\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.islamic=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.islamicc=\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438 \u0446\u0438\u0432\u0438\u043b\u043d\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.japanese=\u0408\u0430\u043f\u0430\u043d\u0441\u043a\u0438 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/sr/calendarname.roc=\u041a\u0430\u043b\u0435\u043d\u0434\u0430\u0440 \u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0435 \u041a\u0438\u043d\u0435
+FormatData/sr/field.dayperiod=\u043f\u0440\u0435 \u043f\u043e\u0434\u043d\u0435/\u043f\u043e\u043f\u043e\u0434\u043d\u0435
+FormatData/sr/field.era=\u0435\u0440\u0430
+FormatData/sr/field.hour=\u0447\u0430\u0441
+FormatData/sr/field.minute=\u043c\u0438\u043d\u0443\u0442
+FormatData/sr/field.month=\u043c\u0435\u0441\u0435\u0446
+FormatData/sr/field.second=\u0441\u0435\u043a\u0443\u043d\u0434
+FormatData/sr/field.week=\u043d\u0435\u0434\u0435\u0459\u0430
+FormatData/sr/field.weekday=\u0434\u0430\u043d \u0443 \u043d\u0435\u0434\u0435\u0459\u0438
+FormatData/sr/field.year=\u0433\u043e\u0434\u0438\u043d\u0430
+FormatData/sr/field.zone=\u0437\u043e\u043d\u0430
+FormatData/sr/islamic.MonthNames/0=\u041c\u0443\u0440\u0430\u0445\u0430\u043c
+FormatData/sr/islamic.MonthNames/1=\u0421\u0430\u0444\u0430\u0440
+FormatData/sr/islamic.MonthNames/2=\u0420\u0430\u0431\u0438\u02bb I
+FormatData/sr/islamic.MonthNames/3=\u0420\u0430\u0431\u0438\u02bb II
+FormatData/sr/islamic.MonthNames/4=\u0408\u0443\u043c\u0430\u0434\u0430 I
+FormatData/sr/islamic.MonthNames/5=\u0408\u0443\u043c\u0430\u0434\u0430 II
+FormatData/sr/islamic.MonthNames/6=\u0420\u0430\u0452\u0430\u0431
+FormatData/sr/islamic.MonthNames/7=\u0428\u0430\u02bb\u0431\u0430\u043d
+FormatData/sr/islamic.MonthNames/8=\u0420\u0430\u043c\u0430\u0434\u0430\u043d
+FormatData/sr/islamic.MonthNames/9=\u0428\u0430\u0432\u0430\u043b
+FormatData/sr/islamic.MonthNames/10=\u0414\u0443\u02bb\u043b-\u041a\u0438\u02bb\u0434\u0430
+FormatData/sr/islamic.MonthNames/11=\u0414\u0443\u02bb\u043b-\u0445\u0438\u0452\u0430
+FormatData/sr/islamic.MonthNames/12=
+FormatData/sr/islamic.Eras/0=
+FormatData/sr/islamic.Eras/1=\u0410\u0425
+FormatData/sv/calendarname.buddhist=buddistisk kalender
+FormatData/sv/calendarname.gregorian=gregoriansk kalender
+FormatData/sv/calendarname.gregory=gregoriansk kalender
+FormatData/sv/calendarname.islamic-civil=islamisk civil kalender
+FormatData/sv/calendarname.islamic=islamisk kalender
+FormatData/sv/calendarname.islamicc=islamisk civil kalender
+FormatData/sv/calendarname.japanese=japansk kalender
+FormatData/sv/calendarname.roc=kinesiska republikens kalender
+FormatData/sv/field.dayperiod=fm/em
+FormatData/sv/field.era=era
+FormatData/sv/field.hour=timme
+FormatData/sv/field.minute=minut
+FormatData/sv/field.month=m\u00e5nad
+FormatData/sv/field.second=sekund
+FormatData/sv/field.week=vecka
+FormatData/sv/field.weekday=veckodag
+FormatData/sv/field.year=\u00e5r
+FormatData/sv/field.zone=tidszon
+FormatData/sv/roc.Eras/0=f\u00f6re R.K.
+FormatData/sv/roc.Eras/1=R.K.
+FormatData/sv/roc.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/sv/roc.DatePatterns/1=d MMMM y GGGG
+FormatData/sv/roc.DatePatterns/2=d MMM y GGGG
+FormatData/sv/roc.DatePatterns/3=GGGG y-MM-dd
+FormatData/sv/islamic.DatePatterns/0=EEEE d MMMM y GGGG
+FormatData/sv/islamic.DatePatterns/1=d MMMM y GGGG
+FormatData/sv/islamic.DatePatterns/2=d MMM y GGGG
+FormatData/sv/islamic.DatePatterns/3=GGGG y-MM-dd
+FormatData/th/calendarname.buddhist=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e1e\u0e38\u0e17\u0e18
+FormatData/th/calendarname.gregorian=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e40\u0e01\u0e23\u0e01\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e19
+FormatData/th/calendarname.gregory=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e40\u0e01\u0e23\u0e01\u0e2d\u0e40\u0e23\u0e35\u0e22\u0e19
+FormatData/th/calendarname.islamic-civil=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21\u0e0b\u0e35\u0e27\u0e34\u0e25
+FormatData/th/calendarname.islamic=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21
+FormatData/th/calendarname.islamicc=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e2d\u0e34\u0e2a\u0e25\u0e32\u0e21\u0e0b\u0e35\u0e27\u0e34\u0e25
+FormatData/th/calendarname.japanese=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e0d\u0e35\u0e48\u0e1b\u0e38\u0e48\u0e19
+FormatData/th/calendarname.roc=\u0e1b\u0e0f\u0e34\u0e17\u0e34\u0e19\u0e44\u0e15\u0e49\u0e2b\u0e27\u0e31\u0e19
+FormatData/th/field.dayperiod=\u0e0a\u0e48\u0e27\u0e07\u0e27\u0e31\u0e19
+FormatData/th/field.era=\u0e2a\u0e21\u0e31\u0e22
+FormatData/th/field.hour=\u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07
+FormatData/th/field.minute=\u0e19\u0e32\u0e17\u0e35
+FormatData/th/field.month=\u0e40\u0e14\u0e37\u0e2d\u0e19
+FormatData/th/field.second=\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35
+FormatData/th/field.week=\u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c
+FormatData/th/field.weekday=\u0e27\u0e31\u0e19\u0e43\u0e19\u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c
+FormatData/th/field.year=\u0e1b\u0e35
+FormatData/th/field.zone=\u0e40\u0e02\u0e15
+FormatData/th/islamic.MonthNames/0=\u0e21\u0e38\u0e2e\u0e30\u0e23\u0e4c\u0e23\u0e2d\u0e21
+FormatData/th/islamic.MonthNames/1=\u0e0b\u0e2d\u0e1f\u0e32\u0e23\u0e4c
+FormatData/th/islamic.MonthNames/2=\u0e23\u0e2d\u0e1a\u0e35 I
+FormatData/th/islamic.MonthNames/3=\u0e23\u0e2d\u0e1a\u0e35 II
+FormatData/th/islamic.MonthNames/4=\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 I
+FormatData/th/islamic.MonthNames/5=\u0e08\u0e38\u0e21\u0e32\u0e14\u0e32 II
+FormatData/th/islamic.MonthNames/6=\u0e23\u0e2d\u0e08\u0e31\u0e1a
+FormatData/th/islamic.MonthNames/7=\u0e0a\u0e30\u0e2d\u0e30\u0e1a\u0e32\u0e19
+FormatData/th/islamic.MonthNames/8=\u0e23\u0e2d\u0e21\u0e30\u0e14\u0e2d\u0e19
+FormatData/th/islamic.MonthNames/9=\u0e40\u0e0a\u0e32\u0e27\u0e31\u0e25
+FormatData/th/islamic.MonthNames/10=\u0e14\u0e2e\u0e38\u0e38\u0e2d\u0e31\u0e25\u0e01\u0e34\u0e14\u0e30\u0e2b\u0e4c
+FormatData/th/islamic.MonthNames/11=\u0e14\u0e2e\u0e38\u0e2d\u0e31\u0e25\u0e2e\u0e34\u0e08\u0e08\u0e30\u0e2b\u0e4c
+FormatData/th/islamic.MonthNames/12=
+FormatData/th/islamic.long.Eras/0=
+FormatData/th/islamic.long.Eras/1=\u0e2e\u0e34\u0e08\u0e40\u0e23\u0e32\u0e30\u0e2b\u0e4c\u0e28\u0e31\u0e01\u0e23\u0e32\u0e0a
+FormatData/th/islamic.Eras/0=
+FormatData/th/islamic.Eras/1=\u0e2e.\u0e28.
+FormatData/th/roc.DatePatterns/0=EEEE\u0e17\u0e35\u0e48 d MMMM \u0e1b\u0e35GGGG\u0e17\u0e35\u0e48 y
+FormatData/th/roc.DatePatterns/1=d MMMM \u0e1b\u0e35GGGG y
+FormatData/th/roc.DatePatterns/2=d MMM GGGG y
+FormatData/th/roc.DatePatterns/3=d/M/yy
+FormatData/tr/calendarname.buddhist=Budist Takvimi
+FormatData/tr/calendarname.gregorian=Miladi Takvim
+FormatData/tr/calendarname.gregory=Miladi Takvim
+FormatData/tr/calendarname.islamic-civil=Arap Takvimi
+FormatData/tr/calendarname.islamic=Hicri Takvim
+FormatData/tr/calendarname.islamicc=Arap Takvimi
+FormatData/tr/calendarname.japanese=Japon Takvimi
+FormatData/tr/calendarname.roc=\u00c7in Cumhuriyeti Takvimi
+FormatData/tr/field.dayperiod=AM/PM
+FormatData/tr/field.era=Miladi D\u00f6nem
+FormatData/tr/field.hour=Saat
+FormatData/tr/field.minute=Dakika
+FormatData/tr/field.month=Ay
+FormatData/tr/field.second=Saniye
+FormatData/tr/field.week=Hafta
+FormatData/tr/field.weekday=Haftan\u0131n G\u00fcn\u00fc
+FormatData/tr/field.year=Y\u0131l
+FormatData/tr/field.zone=Saat Dilimi
+FormatData/tr/islamic.MonthNames/0=Muharrem
+FormatData/tr/islamic.MonthNames/1=Safer
+FormatData/tr/islamic.MonthNames/2=Rebi\u00fclevvel
+FormatData/tr/islamic.MonthNames/3=Rebi\u00fclahir
+FormatData/tr/islamic.MonthNames/4=Cemaziyelevvel
+FormatData/tr/islamic.MonthNames/5=Cemaziyelahir
+FormatData/tr/islamic.MonthNames/6=Recep
+FormatData/tr/islamic.MonthNames/7=\u015eaban
+FormatData/tr/islamic.MonthNames/8=Ramazan
+FormatData/tr/islamic.MonthNames/9=\u015eevval
+FormatData/tr/islamic.MonthNames/10=Zilkade
+FormatData/tr/islamic.MonthNames/11=Zilhicce
+FormatData/tr/islamic.MonthNames/12=
+FormatData/tr/roc.DatePatterns/0=dd MMMM y GGGG EEEE
+FormatData/tr/roc.DatePatterns/1=dd MMMM y GGGG
+FormatData/tr/roc.DatePatterns/2=dd MMM y GGGG
+FormatData/tr/roc.DatePatterns/3=dd.MM.yyyy GGGG
+FormatData/tr/islamic.DatePatterns/0=dd MMMM y GGGG EEEE
+FormatData/tr/islamic.DatePatterns/1=dd MMMM y GGGG
+FormatData/tr/islamic.DatePatterns/2=dd MMM y GGGG
+FormatData/tr/islamic.DatePatterns/3=dd.MM.yyyy GGGG
+FormatData/uk/calendarname.buddhist=\u0411\u0443\u0434\u0434\u0456\u0439\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.gregorian=\u0413\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.gregory=\u0413\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.islamic-civil=\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.islamic=\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.islamicc=\u041c\u0443\u0441\u0443\u043b\u044c\u043c\u0430\u043d\u0441\u044c\u043a\u0438\u0439 \u0441\u0432\u0456\u0442\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.japanese=\u042f\u043f\u043e\u043d\u0441\u044c\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440
+FormatData/uk/calendarname.roc=\u041a\u0438\u0442\u0430\u0439\u0441\u044c\u043a\u0438\u0439 \u0433\u0440\u0438\u0433\u043e\u0440\u0456\u0430\u043d\u0441\u044c\u043a\u0438\u0439
+FormatData/uk/field.dayperiod=\u0427\u0430\u0441\u0442\u0438\u043d\u0430 \u0434\u043e\u0431\u0438
+FormatData/uk/field.era=\u0415\u0440\u0430
+FormatData/uk/field.hour=\u0413\u043e\u0434\u0438\u043d\u0430
+FormatData/uk/field.minute=\u0425\u0432\u0438\u043b\u0438\u043d\u0430
+FormatData/uk/field.month=\u041c\u0456\u0441\u044f\u0446\u044c
+FormatData/uk/field.second=\u0421\u0435\u043a\u0443\u043d\u0434\u0430
+FormatData/uk/field.week=\u0422\u0438\u0436\u0434\u0435\u043d\u044c
+FormatData/uk/field.weekday=\u0414\u0435\u043d\u044c \u0442\u0438\u0436\u043d\u044f
+FormatData/uk/field.year=\u0420\u0456\u043a
+FormatData/uk/field.zone=\u0417\u043e\u043d\u0430
+FormatData/uk/islamic.MonthNames/0=\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c
+FormatData/uk/islamic.MonthNames/1=\u0421\u0430\u0444\u0430\u0440
+FormatData/uk/islamic.MonthNames/2=\u0420\u0430\u0431\u0456 I
+FormatData/uk/islamic.MonthNames/3=\u0420\u0430\u0431\u0456 II
+FormatData/uk/islamic.MonthNames/4=\u0414\u0436\u0443\u043c\u0430\u0434\u0430 I
+FormatData/uk/islamic.MonthNames/5=\u0414\u0436\u0443\u043c\u0430\u0434\u0430 II
+FormatData/uk/islamic.MonthNames/6=\u0420\u0430\u0434\u0436\u0430\u0431
+FormatData/uk/islamic.MonthNames/7=\u0428\u0430\u0430\u0431\u0430\u043d
+FormatData/uk/islamic.MonthNames/8=\u0420\u0430\u043c\u0430\u0434\u0430\u043d
+FormatData/uk/islamic.MonthNames/9=\u0414\u0430\u0432\u0432\u0430\u043b
+FormatData/uk/islamic.MonthNames/10=\u0417\u0443-\u043b\u044c-\u043a\u0430\u0430\u0434\u0430
+FormatData/uk/islamic.MonthNames/11=\u0417\u0443-\u043b\u044c-\u0445\u0456\u0434\u0436\u0430
+FormatData/uk/islamic.MonthNames/12=
+FormatData/vi/calendarname.buddhist=L\u1ecbch Ph\u1eadt Gi\u00e1o
+FormatData/vi/calendarname.gregorian=L\u1ecbch Gregory
+FormatData/vi/calendarname.gregory=L\u1ecbch Gregory
+FormatData/vi/calendarname.islamic-civil=L\u1ecbch Islamic-Civil
+FormatData/vi/calendarname.islamic=L\u1ecbch Islamic
+FormatData/vi/calendarname.islamicc=L\u1ecbch Islamic-Civil
+FormatData/vi/calendarname.japanese=L\u1ecbch Nh\u1eadt B\u1ea3n
+FormatData/vi/calendarname.roc=L\u1ecbch Trung Hoa D\u00e2n Qu\u1ed1c
+FormatData/vi/field.dayperiod=SA/CH
+FormatData/vi/field.era=Th\u1eddi \u0111\u1ea1i
+FormatData/vi/field.hour=Gi\u1edd
+FormatData/vi/field.minute=Ph\u00fat
+FormatData/vi/field.month=Th\u00e1ng
+FormatData/vi/field.second=Gi\u00e2y
+FormatData/vi/field.week=Tu\u1ea7n
+FormatData/vi/field.weekday=Ng\u00e0y trong tu\u1ea7n
+FormatData/vi/field.year=N\u0103m
+FormatData/vi/field.zone=M\u00fai gi\u1edd
+FormatData/vi/roc.DatePatterns/0=EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG
+FormatData/vi/roc.DatePatterns/1='Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG
+FormatData/vi/roc.DatePatterns/2=dd-MM-y GGGG
+FormatData/vi/roc.DatePatterns/3=dd/MM/y GGGG
+FormatData/vi/islamic.DatePatterns/0=EEEE, 'ng\u00e0y' dd MMMM 'n\u0103m' y GGGG
+FormatData/vi/islamic.DatePatterns/1='Ng\u00e0y' dd 'th\u00e1ng' M 'n\u0103m' y GGGG
+FormatData/vi/islamic.DatePatterns/2=dd-MM-y GGGG
+FormatData/vi/islamic.DatePatterns/3=dd/MM/y GGGG
+FormatData/zh/calendarname.buddhist=\u4f5b\u6559\u65e5\u5386
+FormatData/zh/calendarname.gregorian=\u516c\u5386
+FormatData/zh/calendarname.gregory=\u516c\u5386
+FormatData/zh/calendarname.islamic-civil=\u4f0a\u65af\u5170\u5e0c\u5409\u6765\u5386
+FormatData/zh/calendarname.islamic=\u4f0a\u65af\u5170\u65e5\u5386
+FormatData/zh/calendarname.islamicc=\u4f0a\u65af\u5170\u5e0c\u5409\u6765\u5386
+FormatData/zh/calendarname.japanese=\u65e5\u672c\u65e5\u5386
+FormatData/zh/calendarname.roc=\u6c11\u56fd\u65e5\u5386
+FormatData/zh/field.dayperiod=\u4e0a\u5348/\u4e0b\u5348
+FormatData/zh/field.era=\u65f6\u671f
+FormatData/zh/field.hour=\u5c0f\u65f6
+FormatData/zh/field.minute=\u5206\u949f
+FormatData/zh/field.month=\u6708
+FormatData/zh/field.second=\u79d2\u949f
+FormatData/zh/field.week=\u5468
+FormatData/zh/field.weekday=\u5468\u5929
+FormatData/zh/field.year=\u5e74
+FormatData/zh/field.zone=\u533a\u57df
+FormatData/zh/roc.DatePatterns/0=GGGGy\u5e74M\u6708d\u65e5EEEE
+FormatData/zh/roc.DatePatterns/1=GGGGy\u5e74M\u6708d\u65e5
+FormatData/zh/roc.DatePatterns/2=GGGGy-M-d
+FormatData/zh/roc.DatePatterns/3=GGGGy-M-d
+FormatData/zh/islamic.DatePatterns/0=GGGGy\u5e74M\u6708d\u65e5EEEE
+FormatData/zh/islamic.DatePatterns/1=GGGGy\u5e74M\u6708d\u65e5
+FormatData/zh/islamic.DatePatterns/2=GGGGy\u5e74M\u6708d\u65e5
+FormatData/zh/islamic.DatePatterns/3=GGGGyy-MM-dd
+FormatData/zh_TW/calendarname.buddhist=\u4f5b\u6559\u66c6\u6cd5
+FormatData/zh_TW/calendarname.gregorian=\u516c\u66c6
+FormatData/zh_TW/calendarname.gregory=\u516c\u66c6
+FormatData/zh_TW/calendarname.islamic-civil=\u4f0a\u65af\u862d\u57ce\u5e02\u66c6\u6cd5
+FormatData/zh_TW/calendarname.islamic=\u4f0a\u65af\u862d\u66c6\u6cd5
+FormatData/zh_TW/calendarname.islamicc=\u4f0a\u65af\u862d\u57ce\u5e02\u66c6\u6cd5
+FormatData/zh_TW/calendarname.japanese=\u65e5\u672c\u66c6\u6cd5
+FormatData/zh_TW/calendarname.roc=\u6c11\u570b\u66c6
+FormatData/zh_TW/field.dayperiod=\u4e0a\u5348/\u4e0b\u5348
+FormatData/zh_TW/field.era=\u5e74\u4ee3
+FormatData/zh_TW/field.hour=\u5c0f\u6642
+FormatData/zh_TW/field.minute=\u5206\u9418
+FormatData/zh_TW/field.month=\u6708
+FormatData/zh_TW/field.second=\u79d2
+FormatData/zh_TW/field.week=\u9031
+FormatData/zh_TW/field.weekday=\u9031\u5929
+FormatData/zh_TW/field.year=\u5e74
+FormatData/zh_TW/roc.DatePatterns/0=GGGGy\u5e74M\u6708d\u65e5EEEE
+FormatData/zh_TW/roc.DatePatterns/1=GGGGy\u5e74M\u6708d\u65e5
+FormatData/zh_TW/roc.DatePatterns/2=GGGGy/M/d
+FormatData/zh_TW/roc.DatePatterns/3=GGGGy/M/d
+FormatData/zh_TW/islamic.DatePatterns/0=GGGGy\u5e74M\u6708d\u65e5EEEE
+FormatData/zh_TW/islamic.DatePatterns/1=GGGGy\u5e74M\u6708d\u65e5
+FormatData/zh_TW/islamic.DatePatterns/2=GGGGy/M/d
+FormatData/zh_TW/islamic.DatePatterns/3=GGGGy/M/d
--- a/jdk/test/sun/text/resources/LocaleDataTest.java Sun Jan 20 23:38:27 2013 -0800
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java Mon Jan 21 11:16:36 2013 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
* 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,7 +34,7 @@
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
- * 7003124 7085757 7028073 7171028 7189611 8000983 7195759
+ * 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
* @summary Verify locale data
*
*/