OpenJDK / bsd-port / jdk9 / jdk
changeset 3710:f9d15fd48919
Merge
| author | mfang |
|---|---|
| date | Mon, 21 Mar 2011 11:42:38 -0700 |
| parents | 0653cab602f2 258072f4db19 |
| children | d8ced728159f |
| files | |
| diffstat | 27 files changed, 1985 insertions(+), 56 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/text/base/FILES_java.gmk Thu Mar 17 14:33:00 2011 -0700 +++ b/make/java/text/base/FILES_java.gmk Mon Mar 21 11:42:38 2011 -0700 @@ -136,6 +136,7 @@ sun/text/resources/CollationData_sl.java \ sun/text/resources/CollationData_sq.java \ sun/text/resources/CollationData_sr.java \ + sun/text/resources/CollationData_sr_Latn.java \ sun/text/resources/CollationData_sv.java \ sun/text/resources/CollationData_tr.java \ sun/text/resources/CollationData_uk.java \ @@ -251,6 +252,10 @@ sun/text/resources/FormatData_sr_CS.java \ sun/text/resources/FormatData_sr_ME.java \ sun/text/resources/FormatData_sr_RS.java \ + sun/text/resources/FormatData_sr_Latn.java \ + sun/text/resources/FormatData_sr_Latn_BA.java \ + sun/text/resources/FormatData_sr_Latn_ME.java \ + sun/text/resources/FormatData_sr_Latn_RS.java \ sun/text/resources/FormatData_sv.java \ sun/text/resources/FormatData_sv_SE.java \ sun/text/resources/FormatData_tr.java \
--- a/make/java/util/FILES_properties.gmk Thu Mar 17 14:33:00 2011 -0700 +++ b/make/java/util/FILES_properties.gmk Mon Mar 21 11:42:38 2011 -0700 @@ -65,6 +65,7 @@ sun/util/resources/LocaleNames_sl.properties \ sun/util/resources/LocaleNames_sq.properties \ sun/util/resources/LocaleNames_sr.properties \ + sun/util/resources/LocaleNames_sr_Latn.properties \ sun/util/resources/LocaleNames_sv.properties \ sun/util/resources/LocaleNames_tr.properties \ sun/util/resources/LocaleNames_uk.properties \ @@ -111,6 +112,9 @@ sun/util/resources/CalendarData_sl.properties \ sun/util/resources/CalendarData_sq.properties \ sun/util/resources/CalendarData_sr.properties \ + sun/util/resources/CalendarData_sr_Latn_BA.properties \ + sun/util/resources/CalendarData_sr_Latn_ME.properties \ + sun/util/resources/CalendarData_sr_Latn_RS.properties \ sun/util/resources/CalendarData_sv.properties \ sun/util/resources/CalendarData_tr.properties \ sun/util/resources/CalendarData_uk.properties \ @@ -186,6 +190,7 @@ sun/util/resources/CurrencyNames_nl_NL.properties \ sun/util/resources/CurrencyNames_no_NO.properties \ sun/util/resources/CurrencyNames_pl_PL.properties \ + sun/util/resources/CurrencyNames_pt.properties \ sun/util/resources/CurrencyNames_pt_BR.properties \ sun/util/resources/CurrencyNames_pt_PT.properties \ sun/util/resources/CurrencyNames_ro_RO.properties \ @@ -196,6 +201,10 @@ sun/util/resources/CurrencyNames_sr_BA.properties \ sun/util/resources/CurrencyNames_sr_CS.properties \ sun/util/resources/CurrencyNames_sr_ME.properties \ + sun/util/resources/CurrencyNames_sr_RS.properties \ + sun/util/resources/CurrencyNames_sr_Latn_BA.properties \ + sun/util/resources/CurrencyNames_sr_Latn_ME.properties \ + sun/util/resources/CurrencyNames_sr_Latn_RS.properties \ sun/util/resources/CurrencyNames_sv.properties \ sun/util/resources/CurrencyNames_sv_SE.properties \ sun/util/resources/CurrencyNames_tr_TR.properties \
--- a/src/share/classes/java/text/SimpleDateFormat.java Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/classes/java/text/SimpleDateFormat.java Mon Mar 21 11:42:38 2011 -0700 @@ -504,8 +504,8 @@ /** * Cache to hold the DateTimePatterns of a Locale. */ - private static final ConcurrentMap<String, String[]> cachedLocaleData - = new ConcurrentHashMap<String, String[]>(3); + private static final ConcurrentMap<Locale, String[]> cachedLocaleData + = new ConcurrentHashMap<Locale, String[]>(3); /** * Cache NumberFormat instances with Locale key. @@ -619,8 +619,7 @@ initializeCalendar(loc); /* try the cache first */ - String key = getKey(); - String[] dateTimePatterns = cachedLocaleData.get(key); + String[] dateTimePatterns = cachedLocaleData.get(loc); if (dateTimePatterns == null) { /* cache miss */ ResourceBundle r = LocaleData.getDateFormatData(loc); if (!isGregorianCalendar()) { @@ -633,7 +632,7 @@ dateTimePatterns = r.getStringArray("DateTimePatterns"); } /* update cache */ - cachedLocaleData.putIfAbsent(key, dateTimePatterns); + cachedLocaleData.putIfAbsent(loc, dateTimePatterns); } formatData = DateFormatSymbols.getInstanceRef(loc); if ((timeStyle >= 0) && (dateStyle >= 0)) { @@ -684,13 +683,6 @@ } } - private String getKey() { - StringBuilder sb = new StringBuilder(); - sb.append(getCalendarName()).append('.'); - sb.append(locale.getLanguage()).append('_').append(locale.getCountry()).append('_').append(locale.getVariant()); - return sb.toString(); - } - /** * Returns the compiled form of the given pattern. The syntax of * the compiled pattern is:
--- a/src/share/classes/sun/applet/resources/MsgAppletViewer.java Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/classes/sun/applet/resources/MsgAppletViewer.java Mon Mar 21 11:42:38 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -103,7 +103,6 @@ {"appletclassloader.fileexception", "{0} exception when loading: {1}"}, {"appletclassloader.filedeath", "{0} killed when loading: {1}"}, {"appletclassloader.fileerror", "{0} error when loading: {1}"}, - {"appletclassloader.findclass.verbose.findclass", "{0} find class {1}"}, {"appletclassloader.findclass.verbose.openstream", "Opening stream to: {0} to get {1}"}, {"appletclassloader.getresource.verbose.forname", "AppletClassLoader.getResource for name: {0}"}, {"appletclassloader.getresource.verbose.found", "Found resource: {0} as a system resource"},
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/text/resources/CollationData_sr_Latn.java Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + */ + +/* + * (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved + * (C) Copyright IBM Corp. 1996 - 1998 - All Rights Reserved + * + * The original version of this source code and documentation + * is copyrighted and owned by Taligent, Inc., a wholly-owned + * subsidiary of IBM. These materials are provided under terms + * of a License Agreement between Taligent and Sun. This technology + * is protected by multiple US and International patents. + * + * This notice and attribution to Taligent may not be removed. + * Taligent is a registered trademark of Taligent, Inc. + * + */ + +package sun.text.resources; + +import java.util.ListResourceBundle; + +public class CollationData_sr_Latn extends ListResourceBundle { + + protected final Object[][] getContents() { + return new Object[][] { + { "Rule", + /* for sr-Latin, default sorting except for the following: */ + + /* add dz "ligature" between d and d<stroke>. */ + /* add d<stroke> between d and e. */ + /* add lj "ligature" between l and l<stroke>. */ + /* add l<stroke> between l and m. */ + /* add nj "ligature" between n and o. */ + /* add z<abovedot> after z. */ + "& \u200f = \u030c " + + "& \u0306 = \u030d " + + "& C < c\u030c , C\u030c " // C < c-caron + + "< c\u0301 , C\u0301 " // c-acute + + "& D < \u01f3 , \u01f2 , \u01f1 " // dz + + "< dz , dZ , Dz , DZ " // dz ligature + + "< \u01c6 , \u01c5 , \u01c4 " // dz-caron + + "< \u0111 , \u0110 " // d-stroke + + "& L < lj , lJ , Lj , LJ " // l < lj ligature + + "& N < nj , nJ , Nj , NJ " // n < nj ligature + + "& S < s\u030c , S\u030c " // s < s-caron + + "& Z < z\u030c , Z\u030c " // z < z-caron + } + }; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/text/resources/FormatData_sr_Latn.java Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,171 @@ +/* + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * COPYRIGHT AND PERMISSION NOTICE + * + * Copyright (C) 1991-2011 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. + */ + +// Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +package sun.text.resources; + +import java.util.ListResourceBundle; + +public class FormatData_sr_Latn extends ListResourceBundle { + protected final Object[][] getContents() { + return new Object[][] { + { "MonthNames", + new String[] { + "januar", + "februar", + "mart", + "april", + "maj", + "jun", + "jul", + "avgust", + "septembar", + "oktobar", + "novembar", + "decembar", + "", + } + }, + { "MonthAbbreviations", + new String[] { + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "avg", + "sep", + "okt", + "nov", + "dec", + "", + } + }, + { "DayNames", + new String[] { + "nedelja", + "ponedeljak", + "utorak", + "sreda", + "\u010detvrtak", + "petak", + "subota", + } + }, + { "DayAbbreviations", + new String[] { + "ned", + "pon", + "uto", + "sre", + "\u010det", + "pet", + "sub", + } + }, + { "Eras", + new String[] { + "p. n. e.", + "n. e", + } + }, + { "NumberPatterns", + new String[] { + "#,##0.###", + "\u00a4\u00a0#,##0.00", + "#,##0%", + } + }, + { "NumberElements", + new String[] { + ".", + ",", + ";", + "%", + "0", + "#", + "-", + "E", + "\u2030", + "\u221e", + "NaN", + } + }, + { "DateTimePatterns", + new String[] { + "HH.mm.ss zzzz", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE, dd. MMMM y.", + "dd. MMMM y.", + "dd.MM.y.", + "d.M.yy.", + "{1} {0}", + } + }, + }; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/text/resources/FormatData_sr_Latn_BA.java Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * COPYRIGHT AND PERMISSION NOTICE + * + * Copyright (C) 1991-2011 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. + */ + +// Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +package sun.text.resources; + +import sun.util.EmptyListResourceBundle; + +public class FormatData_sr_Latn_BA extends EmptyListResourceBundle { +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/text/resources/FormatData_sr_Latn_ME.java Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,87 @@ +/* + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * COPYRIGHT AND PERMISSION NOTICE + * + * Copyright (C) 1991-2011 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. + */ + +// Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +package sun.text.resources; + +import java.util.ListResourceBundle; + +public class FormatData_sr_Latn_ME extends ListResourceBundle { + protected final Object[][] getContents() { + return new Object[][] { + { "DateTimePatterns", + new String[] { + "HH.mm.ss zzzz", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + "EEEE, dd. MMMM y.", + "d.MM.yyyy.", + "dd.MM.y.", + "d.M.yy.", + "{1} {0}", + } + } + }; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/text/resources/FormatData_sr_Latn_RS.java Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,70 @@ +/* + * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * COPYRIGHT AND PERMISSION NOTICE + * + * Copyright (C) 1991-2011 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. + */ + +// Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +package sun.text.resources; + +import sun.util.EmptyListResourceBundle; + +public class FormatData_sr_Latn_RS extends EmptyListResourceBundle { +}
--- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java Mon Mar 21 11:42:38 2011 -0700 @@ -44,7 +44,7 @@ * or if the keys ends with ".mnemonic", an element * representing a mnemomic keycode <code>int</code> or <code>char</code>. */ -public class JConsoleResources_ja extends ListResourceBundle { +public class JConsoleResources_ja extends JConsoleResources { /** * Returns the contents of this <code>ResourceBundle</code>.
--- a/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java Mon Mar 21 11:42:38 2011 -0700 @@ -44,7 +44,7 @@ * or if the keys ends with ".mnemonic", an element * representing a mnemomic keycode <code>int</code> or <code>char</code>. */ -public class JConsoleResources_zh_CN extends ListResourceBundle { +public class JConsoleResources_zh_CN extends JConsoleResources { /** * Returns the contents of this <code>ResourceBundle</code>.
--- a/src/share/classes/sun/util/logging/resources/logging.properties Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/classes/sun/util/logging/resources/logging.properties Mon Mar 21 11:42:38 2011 -0700 @@ -25,13 +25,22 @@ # Localizations for Level names. For the US locale # these are the same as the non-localized level name. + +# The following ALL CAPS words should be translated. ALL=ALL +# The following ALL CAPS words should be translated. SEVERE=SEVERE +# The following ALL CAPS words should be translated. WARNING=WARNING +# The following ALL CAPS words should be translated. INFO=INFO +# The following ALL CAPS words should be translated. CONFIG= CONFIG +# The following ALL CAPS words should be translated. FINE=FINE +# The following ALL CAPS words should be translated. FINER=FINER +# The following ALL CAPS words should be translated. FINEST=FINEST +# The following ALL CAPS words should be translated. OFF=OFF -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CalendarData_sr_Latn_BA.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,66 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +minimalDaysInFirstWeek=4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CalendarData_sr_Latn_ME.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,66 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +minimalDaysInFirstWeek=4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,66 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +minimalDaysInFirstWeek=4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CurrencyNames_pt.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,250 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. +# + +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! + +adp=Peseta de Andorra +aed=Dir\u00e9m dos Emirados \u00c1rabes Unidos +afa=Afegane (1927-2002) +afn=Afegane +all=Lek Alban\u00eas +amd=Dram arm\u00eanio +ang=Guilder das Antilhas Holandesas +aoa=Cuanza angolano +ars=Peso argentino +ats=Xelim austr\u00edaco +aud=D\u00f3lar australiano +awg=Guilder de Aruba +azm=Manat azerbaijano +azn=Manat do Azerbaij\u00e3o +bam=Marco b\u00f3snio-herzegovino convers\u00edvel +bbd=D\u00f3lar de Barbados +bdt=Taka de Bangladesh +bef=Franco belga +bgl=Lev forte b\u00falgaro +bgn=Lev novo b\u00falgaro +bhd=Dinar bareinita +bif=Franco do Burundi +bmd=D\u00f3lar das Bermudas +bnd=D\u00f3lar do Brunei +bov=Mvdol boliviano +brl=Real brasileiro +bsd=D\u00f3lar das Bahamas +btn=Ngultrum do But\u00e3o +bwp=Pula botsuanesa +byb=Rublo novo bielo-russo (1994-1999) +byr=Rublo bielo-russo +bzd=D\u00f3lar do Belize +cad=D\u00f3lar canadense +cdf=Franco congol\u00eas +chf=Franco su\u00ed\u00e7o +clf=Unidades de Fomento chilenas +clp=Peso chileno +cny=Yuan Renminbi chin\u00eas +cop=Peso colombiano +crc=Colon da Costa Rica +csd=Dinar s\u00e9rvio antigo +cup=Peso cubano +cve=Escudo cabo-verdiano +cyp=Libra cipriota +czk=Coroa checa +dem=Marco alem\u00e3o +djf=Franco do Djibuti +dkk=Coroa dinamarquesa +dop=Peso dominicano +dzd=Dinar argelino +eek=Coroa estoniana +egp=Libra eg\u00edpcia +ern=Nakfa da Eritreia +esp=Peseta espanhola +etb=Birr et\u00edope +fim=Marca finlandesa +fjd=D\u00f3lar de Fiji +fkp=Libra das Malvinas +frf=Franco franc\u00eas +gbp=Libra esterlina brit\u00e2nica +gel=Lari georgiano +ghc=Cedi de Gana (1979-2007) +ghs=Cedi gan\u00eas +gip=Libra de Gibraltar +gmd=Dalasi de G\u00e2mbia +gnf=Franco de Guin\u00e9 +grd=Dracma grego +gtq=Quet\u00e7al da Guatemala +gwp=Peso da Guin\u00e9-Bissau +gyd=D\u00f3lar da Guiana +hkd=D\u00f3lar de Hong Kong +hnl=Lempira de Honduras +hrk=Kuna croata +htg=Gurde do Haiti +huf=Forinte h\u00fangaro +idr=Rupia indon\u00e9sia +iep=Libra irlandesa +ils=Sheqel Novo israelita +inr=R\u00fapia indiana +iqd=Dinar iraquiano +irr=Rial iraniano +isk=Coroa islandesa +itl=Lira italiana +jmd=D\u00f3lar jamaicano +jod=Dinar jordaniano +jpy=Iene japon\u00eas +kes=Xelim queniano +kgs=Som quirguiz +khr=Riel cambojano +kmf=Franco de Comores +kpw=Won norte-coreano +krw=Won sul-coreano +kwd=Dinar coveitiano +kyd=D\u00f3lar das Ilhas Caiman +kzt=Tenge do Cazaquist\u00e3o +lak=Kip de Laos +lbp=Libra libanesa +lkr=Rupia do Sri Lanka +lrd=D\u00f3lar liberiano +lsl=Loti do Lesoto +ltl=Lita lituano +luf=Franco luxemburgu\u00eas +lvl=Lats let\u00e3o +lyd=Dinar l\u00edbio +mad=Dir\u00e9m marroquino +mdl=Leu mold\u00e1vio +mga=Ariary de Madagascar +mgf=Franco de Madagascar +mkd=Dinar maced\u00f4nio +mmk=Kyat de Mianmar +mnt=Tugrik mongol +mop=Pataca macaense +mro=Ouguiya da Maurit\u00e2nia +mtl=Lira maltesa +mur=Rupia de Maur\u00edcio +mvr=Rupias das Ilhas Maldivas +mwk=Cuacha do Mal\u00e1ui +mxn=Peso mexicano +mxv=Unidade Mexicana de Investimento (UDI) +myr=Ringgit malaio +mzm=Metical antigo de Mo\u00e7ambique +mzn=Metical do Mo\u00e7ambique +nad=D\u00f3lar da Nam\u00edbia +ngn=Naira nigeriana +nio=C\u00f3rdoba Ouro nicaraguense +nlg=Florim holand\u00eas +nok=Coroa norueguesa +npr=Rupia nepalesa +nzd=D\u00f3lar da Nova Zel\u00e2ndia +omr=Rial de Om\u00e3 +pab=Balboa panamenho +pen=Sol Novo peruano +pgk=Kina da Papua-Nova Guin\u00e9 +php=Peso filipino +pkr=Rupia paquistanesa +pln=Zloti polon\u00eas +pte=Escudo portugu\u00eas +pyg=Guarani paraguaio +qar=Rial catariano +rol=Leu romeno antigo +ron=Leu romeno +rsd=Dinar s\u00e9rvio +rub=Rublo russo +rur=Rublo russo (1991-1998) +rwf=Franco ruand\u00eas +sar=Rial saudita +sbd=D\u00f3lar das Ilhas Salom\u00e3o +scr=Rupia das Seychelles +sdd=Dinar sudan\u00eas +sdg=Libra sudanesa +sek=Coroa sueca +sgd=D\u00f3lar de Cingapura +shp=Libra de Santa Helena +sit=Tolar Bons esloveno +skk=Coroa eslovaca +sll=Leone de Serra Leoa +sos=Xelim somali +srd=D\u00f3lar do Suriname +srg=Florim do Suriname +std=Dobra de S\u00e3o Tom\u00e9 e Pr\u00edncipe +svc=Colom salvadorenho +syp=Libra s\u00edria +szl=Lilangeni da Suazil\u00e2ndia +thb=Baht tailand\u00eas +tjs=Somoni tadjique +tmm=Manat do Turcomenist\u00e3o +tnd=Dinar tunisiano +top=Pa\u02bbanga de Tonga +tpe=Escudo timorense +trl=Lira turca antiga +try=Lira turca +ttd=D\u00f3lar de Trinidad e Tobago +twd=D\u00f3lar Novo de Taiwan +tzs=Xelim da Tanz\u00e2nia +uah=Hryvnia ucraniano +ugx=Xelim ugandense +usd=D\u00f3lar norte-americano +usn=D\u00f3lar norte-americano (Dia seguinte) +uss=D\u00f3lar norte-americano (Mesmo dia) +uyu=Peso uruguaio +uzs=Sum do Usbequist\u00e3o +veb=Bol\u00edvar venezuelano +vef=Bol\u00edvar v enezuelano forte +vnd=Dong vietnamita +vuv=Vatu de Vanuatu +wst=Tala samoano +xaf=Franco CFA BEAC +xag=Prata +xau=Ouro +xba=Unidade Composta Europeia +xbb=Unidade Monet\u00e1ria Europeia +xbc=Unidade de Conta Europeia (XBC) +xbd=Unidade de Conta Europeia (XBD) +xcd=D\u00f3lar do Caribe Oriental +xdr=Direitos Especiais de Giro +xfo=Franco-ouro franc\u00eas +xfu=Franco UIC franc\u00eas +xof=Franco CFA BCEAO +xpd=Pal\u00e1dio +xpf=Franco CFP +xpt=Platina +xts=C\u00f3digo de Moeda de Teste +xxx=Moeda Desconhecida ou Inv\u00e1lida +yer=Rial iemenita +yum=Dinar noviy iugoslavo +zar=Rand sul-africano +zmk=Cuacha zambiano +zwd=D\u00f3lar do Zimb\u00e1bue
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,69 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +BAM=KM +bam=bosansko-hercegova\u010dkih konvertibilnih maraka +EUR=\u20ac +eur=evra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,67 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +EUR=\u20ac +eur=evra
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,67 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +RSD=din. +rsd=srpski dinari
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,43 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. +# + +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! + +RSD=\u0434\u0438\u043d.
--- a/src/share/classes/sun/util/resources/LocaleData.java Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/classes/sun/util/resources/LocaleData.java Mon Mar 21 11:42:38 2011 -0700 @@ -171,16 +171,21 @@ /* Get the locale string list from LocaleDataMetaInfo class. */ String localeString = LocaleDataMetaInfo.getSupportedLocaleString(baseName); - if (localeString.length() == 0) { + if (localeString.length() == 0) { return candidates; } for (Iterator<Locale> l = candidates.iterator(); l.hasNext(); ) { - String lstr = l.next().toString(); - /* truncate extra segment introduced by Java 7 for script and extesions */ - int idx = lstr.indexOf("_#"); - if (idx >= 0) { - lstr = lstr.substring(0, idx); + Locale loc = l.next(); + String lstr = null; + if (loc.getScript().length() > 0) { + lstr = loc.toLanguageTag().replace('-', '_'); + } else { + lstr = loc.toString(); + int idx = lstr.indexOf("_#"); + if (idx >= 0) { + lstr = lstr.substring(0, idx); + } } /* Every locale string in the locale string list returned from the above getSupportedLocaleString is enclosed @@ -265,28 +270,15 @@ Locale[] locales = new Locale[localeStringTokenizer.countTokens()]; for (int i = 0; i < locales.length; i++) { - String currentToken = localeStringTokenizer.nextToken(); - int p2 = 0; - int p1 = currentToken.indexOf('_'); - String language = ""; - String country = ""; - String variant = ""; - - if (p1 == -1) { - language = currentToken; - } else { - language = currentToken.substring(0, p1); - p2 = currentToken.indexOf('_', p1 + 1); - if (p2 == -1) { - country = currentToken.substring(p1 + 1); - } else { - country = currentToken.substring(p1 + 1, p2); - if (p2 < currentToken.length()) { - variant = currentToken.substring(p2 + 1); - } - } + String currentToken = localeStringTokenizer.nextToken().replace('_','-'); + if (currentToken.equals("ja-JP-JP")) { + currentToken = "ja-JP-u-ca-japanese-x-lvariant-JP"; + } else if (currentToken.equals("th-TH-TH")) { + currentToken = "th-TH-u-nu-thai-x-lvariant-TH"; + } else if (currentToken.equals("no-NO-NY")) { + currentToken = "no-NO-x-lvariant-NY"; } - locales[i] = new Locale(language, country, variant); + locales[i] = Locale.forLanguageTag(currentToken); } return locales; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/classes/sun/util/resources/LocaleNames_sr_Latn.properties Mon Mar 21 11:42:38 2011 -0700 @@ -0,0 +1,471 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# 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. +# + +# +# COPYRIGHT AND PERMISSION NOTICE +# +# Copyright (C) 1991-2011 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. + +# +# Generated automatically from the Common Locale Data Repository. DO NOT EDIT! +# +aa=Afarski +ab=Abkazijski +ae=Avestanski +af=Afrikanerski +am=Amharski +an=Aragone\u017eanski +ar=Arapski +as=Asemijski +av=Avarski +ay=Ajmara +az=Azerbejd\u017eanski +ba=Ba\u0161kir +be=Beloruski +bg=Bugarski +bh=Biharski +bn=Bengalski +bo=Tibetanski +br=Bretonski +bs=Bosanski +ca=Katalonski +ce=\u010ce\u010denski +ch=\u010camoro +co=Korzikanski +cr=Kri +cs=\u010ce\u0161ki +cu=Staroslovenski +cv=\u010cuva\u0161ki +cy=Vel\u0161ki +da=Danski +de=Nema\u010dki +dv=Divehijski +dz=D\u017eonga +ee=Eve +el=Gr\u010dki +en=Engleski +eo=Esperanto +es=\u0160panski +et=Estonski +eu=Baskijski +fa=Persijski +fi=Finski +fj=Fid\u017eijski +fo=Farski +fr=Francuski +fy=Frizijski +ga=Irski +gd=\u0160kotski Galski +gl=Galski +gn=Gvarani +gu=Gud\u017earati +gv=Manks +he=Hebrejski +hi=Hindi +hr=Hrvatski +ht=Hai\u0107anski +hu=Ma\u0111arski +hy=Jermenski +ia=Interlingva +id=Indonezijski +ie=Interlingve +ii=Si\u010duan ji +ik=Inupiak +in=Indonezijski +is=Islandski +it=Italijanski +iw=Hebrejski +ja=Japanski +ji=Jidi\u0161 +jv=Javanski +ka=Gruzijski +ki=Kikuju +kj=Kuanjama +kk=Koza\u010dki +kl=Kalalisutski +km=Kmerski +kn=Kanada +ko=Korejski +ks=Ka\u0161miri +ku=Kurdski +kw=Korni\u0161ki +ky=Kirgiski +la=Latinski +lb=Luksembur\u0161ki +li=Limburgi\u0161 +lo=Lao\u0161ki +lt=Litvanski +lu=Luba-katanga +lv=Letonski +mg=Malagazijski +mh=Mar\u0161alski +mi=Maorski +mk=Makedonski +ml=Malajalam +mn=Mongolski +mo=Moldavski +mr=Marati +ms=Malajski +mt=Melte\u0161ki +my=Burmanski +nb=Norve\u0161ki bokm\u00e5l +nd=Severni ndebele +ne=Nepalski +nl=Holandski +nn=Norve\u0161ki njorsk +no=Norve\u0161ki +nr=Ju\u017eni ndebele +nv=Navaho +ny=Njanja +oc=Provansalski +oj=Ojibva +or=Orijski +os=Osetski +pa=Pand\u017eabski +pl=Poljski +ps=Pa\u0161tunski +pt=Portugalski +qu=Kven\u010da +rm=Reto-Romanski +ro=Rumunski +ru=Ruski +rw=Kinjarvanda +sa=Sanskrit +sc=Sardinijski +sd=Sindi +se=Severni sami +si=Singaleski +sk=Slova\u010dki +sl=Slovena\u010dki +sm=Samoanski +sn=\u0160ona +so=Somalski +sq=Albanski +sr=Srpski +ss=Svati +st=Sesoto +su=Sudanski +sv=\u0160vedski +sw=Svahili +ta=Tamilski +tg=Ta\u0111ik +th=Tajlandski +ti=Tigrinja +tk=Turkmenski +tl=Tagalski +tn=Tsvana +tr=Turski +tt=Tatarski +tw=Tvi +ty=Tahi\u0107anski +ug=Ujgurski +uk=Ukrajinski +uz=Uzbe\u010dki +vi=Vijetnamski +wa=Valun +wo=Volof +xh=Khosa +yi=Jidi\u0161 +yo=Jorubanski +za=Zuang +zh=Kineski +AD=Andora +AE=Ujedinjeni Arapski Emirati +AF=Avganistan +AG=Antigva i Barbuda +AI=Angvila +AL=Albanija +AM=Armenija +AN=Holandski Antili +AO=Angola +AQ=Antarktika +AR=Argentina +AS=Ameri\u010dka Samoa +AT=Austrija +AU=Australija +AW=Aruba +AX=Alandska ostrva +AZ=Azerbejd\u017ean +BA=Bosna i Hercegovina +BB=Barbados +BD=Banglade\u0161 +BE=Belgija +BF=Burkina Faso +BG=Bugarska +BH=Bahrein +BI=Burundi +BJ=Benin +BL=Sv. Bartolomej +BM=Bermuda +BN=Brunej +BO=Bolivija +BR=Brazil +BS=Bahami +BT=Butan +BV=Buve Ostrva +BW=Bocvana +BY=Belorusija +BZ=Belise +CA=Kanada +CC=Kokos (Keling) Ostrva +CD=Demokratska Republika Kongo +CF=Centralno Afri\u010dka Republika +CG=Kongo +CH=\u0160vajcarska +CI=Obala Slonova\u010de +CK=Kukova Ostrva +CL=\u010cile +CM=Kamerun +CN=Kina +CO=Kolumbija +CR=Kostarika +CU=Kuba +CV=Kape Verde +CX=Bo\u017ei\u0107na Ostrva +CY=Kipar +CZ=\u010ce\u0161ka +DE=Nema\u010dka +DJ=D\u017eibuti +DK=Danska +DM=Dominika +DO=Dominikanska Republika +DZ=Al\u017eir +EC=Ekvador +EE=Estonija +EG=Egipat +EH=Zapadna Sahara +ER=Eritreja +ES=\u0160panija +ET=Etiopija +FI=Finska +FJ=Fid\u017ei +FK=Folklandska Ostrva +FM=Mikronezija +FO=Farska Ostrva +FR=Francuska +GA=Gabon +GB=Velika Britanija +GD=Grenada +GE=Gruzija +GF=Francuska Gvajana +GG=Gurnsi +GH=Gana +GI=Gibraltar +GL=Grenland +GM=Gambija +GN=Gvineja +GP=Gvadelupe +GQ=Ekvatorijalna Gvineja +GR=Gr\u010dka +GS=Ju\u017ena D\u017eord\u017eija i Ju\u017ena Sendvi\u010d Ostrva +GT=Gvatemala +GU=Guam +GW=Gvineja-Bisao +GY=Gvajana +HK=Hong Kong (S. A. R. Kina) +HM=Herd i Mekdonald Ostrva +HN=Honduras +HR=Hrvatska +HT=Haiti +HU=Ma\u0111arska +ID=Indonezija +IE=Irska +IL=Izrael +IM=Ostrvo Man +IN=Indija +IO=Britansko Indijska Okeanska Teritorija +IQ=Irak +IR=Iran +IS=Island +IT=Italija +JE=D\u017eersi +JM=Jamajka +JO=Jordan +JP=Japan +KE=Kenija +KG=Kirgizstan +KH=Kambod\u017ea +KI=Kiribati +KM=Komorska Ostrva +KN=Sent Kits i Nevis +KP=Severna Koreja +KR=Ju\u017ena Koreja +KW=Kuvajt +KY=Kajmanska Ostrva +KZ=Kazahstan +LA=Laos +LB=Liban +LC=Sent Lucija +LI=Lihten\u0161tajn +LK=\u0160ri Lanka +LR=Liberija +LS=Lesoto +LT=Litvanija +LU=Luksemburg +LV=Letonija +LY=Libija +MA=Maroko +MC=Monako +MD=Moldavija +ME=Crna Gora +MF=Sv. Martin +MG=Madagaskar +MH=Mar\u0161alska Ostrva +MK=Makedonija +ML=Mali +MM=Mijanmar +MN=Mongolija +MO=Makao (S. A. R. Kina) +MP=Severna Marijanska Ostrva +MQ=Martinik +MR=Mauritanija +MS=Monserat +MT=Malta +MU=Mauricius +MV=Maldivi +MW=Malavi +MX=Meksiko +MY=Malezija +MZ=Mozambik +NA=Namibija +NC=Nova Kaledonija +NE=Niger +NF=Norfolk Ostrvo +NG=Nigerija +NI=Nikaragva +NL=Holandija +NO=Norve\u0161ka +NP=Nepal +NR=Nauru +NU=Niue +NZ=Novi Zeland +OM=Oman +PA=Panama +PE=Peru +PF=Francuska Polinezija +PG=Papua Nova Gvineja +PH=Filipini +PK=Pakistan +PL=Poljska +PM=Sen Pjer i Mikelon +PN=Pitcairn +PR=Porto Riko +PS=Palestinska Teritorija +PT=Portugal +PW=Palau +PY=Paragvaj +QA=Katar +RE=Rejunion +RO=Rumunija +RS=Srbija +RU=Rusija +RW=Ruanda +SA=Saudijska Arabija +SB=Solomonska Ostrva +SC=Sej\u0161eli +SD=Sudan +SE=\u0160vedska +SG=Singapur +SH=Sveta Jelena +SI=Slovenija +SJ=Svalbard i Janmajen Ostrva +SK=Slova\u010dka +SL=Sijera Leone +SM=San Marino +SN=Senegal +SO=Somalija +SR=Surinam +ST=Sao Tome i Principe +SV=Salvador +SY=Sirija +SZ=Svazilend +TC=Turks i Kajkos Ostrva +TD=\u010cad +TF=Francuske Ju\u017ene Teritorije +TG=Togo +TH=Tajland +TJ=Tad\u017eikistan +TK=Tokelau +TL=Isto\u010dni Timor +TM=Turkmenistan +TN=Tunis +TO=Tonga +TR=Turska +TT=Trinidad i Tobago +TV=Tuvalu +TW=Tajvan +TZ=Tanzanija +UA=Ukrajina +UG=Uganda +UM=Manja Udaljena Ostrva SAD +US=Sjedinjene Ameri\u010dke Dr\u017eave +UY=Urugvaj +UZ=Uzbekistan +VA=Vatikan +VC=Sent Vinsent i Grenadini +VE=Venecuela +VG=Britanska Devi\u010danska Ostrva +VI=S.A.D. Devi\u010danska Ostrva +VN=Vijetnam +VU=Vanuatu +WF=Valis i Futuna Ostrva +WS=Samoa +YE=Jemen +YT=Majote +ZA=Ju\u017enoafri\u010dka Republika +ZM=Zambija +ZW=Zimbabve
--- a/src/share/demo/jfc/Notepad/resources/Notepad.properties Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/demo/jfc/Notepad/resources/Notepad.properties Mon Mar 21 11:42:38 2011 -0700 @@ -3,12 +3,15 @@ Title=Notepad ElementTreeFrameTitle=Elements +# The following string should NOT be translated: ViewportBackingStore ViewportBackingStore=false # menubar definition # # Each of the strings that follow form a key to be # used to the actual menu definition. + +# The following string should NOT be translated: menubar menubar=file edit debug # file Menu definition @@ -20,6 +23,8 @@ # new -> Notepad.newAction # save -> Notepad.saveAction # exit -> Notepad.exitAction + +# The following string should NOT be translated: file file=new open save - exit fileLabel=File openLabel=Open @@ -36,28 +41,38 @@ # cut -> JTextComponent.cutAction # copy -> JTextComponent.copyAction # paste -> JTextComponent.pasteAction + +# The following string should NOT be translated: edit edit=cut copy paste - undo redo editLabel=Edit cutLabel=Cut +# The following string should NOT be translated: cutAction cutAction=cut-to-clipboard cutImage=resources/cut.gif copyLabel=Copy +# The following string should NOT be translated: copyAction copyAction=copy-to-clipboard copyImage=resources/copy.gif pasteLabel=Paste +# The following string should NOT be translated: pasteAction pasteAction=paste-from-clipboard pasteImage=resources/paste.gif undoLabel=Undo +# The following string should NOT be translated: undoAction undoAction=Undo redoLabel=Redo +# The following string should NOT be translated: redoAction redoAction=Redo # # debug Menu definition # + +# The following string should NOT be translated: debug debug=dump showElementTree debugLabel=Debug dumpLabel=Dump model to System.err +# The following string should NOT be translated: dumpAction dumpAction=dump-model showElementTreeLabel=Show Elements @@ -67,6 +82,8 @@ # used as the basis of the tool definition. Actions # are of course sharable, and in this case are shared # with the menu items. + +# The following string should NOT be translated: toolbar toolbar=new open save - cut copy paste newTooltip=Create a new file openTooltip=Open a file
--- a/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties Mon Mar 21 11:42:38 2011 -0700 @@ -9,7 +9,7 @@ # # Each of the strings that follow form a key to be # used to the actual menu definition. -menubar=\u30D5\u30A1\u30A4\u30EB \u7DE8\u96C6 \u30C7\u30D0\u30C3\u30B0 +menubar=file edit debug # file Menu definition # @@ -20,7 +20,7 @@ # new -> Notepad.newAction # save -> Notepad.saveAction # exit -> Notepad.exitAction -file=\u65B0\u898F \u958B\u304F \u4FDD\u5B58 - \u7D42\u4E86 +file=new open save - exit fileLabel=\u30D5\u30A1\u30A4\u30EB openLabel=\u958B\u304F openImage=resources/open.gif @@ -36,7 +36,7 @@ # cut -> JTextComponent.cutAction # copy -> JTextComponent.copyAction # paste -> JTextComponent.pasteAction -edit=\u5207\u53D6\u308A \u30B3\u30D4\u30FC \u8CBC\u4ED8\u3051 - \u5143\u306B\u623B\u3059 \u518D\u5B9F\u884C +edit=cut copy paste - undo redo editLabel=\u7DE8\u96C6 cutLabel=\u5207\u53D6\u308A cutAction=cut-to-clipboard @@ -48,14 +48,14 @@ pasteAction=paste-from-clipboard pasteImage=resources/paste.gif undoLabel=\u5143\u306B\u623B\u3059 -undoAction=\u5143\u306B\u623B\u3059 +undoAction=Undo redoLabel=\u518D\u5B9F\u884C -redoAction=\u518D\u5B9F\u884C +redoAction=Redo # # debug Menu definition # -debug=showElementTree\u306E\u30C0\u30F3\u30D7 +debug=dump showElementTree debugLabel=\u30C7\u30D0\u30C3\u30B0 dumpLabel=\u30E2\u30C7\u30EB\u3092System.err\u306B\u30C0\u30F3\u30D7 dumpAction=dump-model @@ -67,7 +67,7 @@ # used as the basis of the tool definition. Actions # are of course sharable, and in this case are shared # with the menu items. -toolbar=\u65B0\u898F \u958B\u304F \u4FDD\u5B58 - \u5207\u53D6\u308A \u30B3\u30D4\u30FC \u8CBC\u4ED8\u3051 +toolbar=new open save - cut copy paste newTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B openTooltip=\u30D5\u30A1\u30A4\u30EB\u3092\u958B\u304F saveTooltip=\u30D5\u30A1\u30A4\u30EB\u306B\u4FDD\u5B58
--- a/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties Thu Mar 17 14:33:00 2011 -0700 +++ b/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties Mon Mar 21 11:42:38 2011 -0700 @@ -48,9 +48,9 @@ pasteAction=paste-from-clipboard pasteImage=resources/paste.gif undoLabel=\u64A4\u6D88 -undoAction=\u64A4\u6D88 +undoAction=Undo redoLabel=\u91CD\u505A -redoAction=\u91CD\u505A +redoAction=Redo # # debug Menu definition
--- a/test/sun/text/resources/LocaleData Thu Mar 17 14:33:00 2011 -0700 +++ b/test/sun/text/resources/LocaleData Mon Mar 21 11:42:38 2011 -0700 @@ -6101,3 +6101,258 @@ # bug 6919624 CalendarData/hu/minimalDaysInFirstWeek=4 + +# bug 6998391 +CalendarData/sr-Latn/firstDayOfWeek=2 +CalendarData/sr-Latn-BA/firstDayOfWeek=2 +CalendarData/sr-Latn-ME/firstDayOfWeek=2 +CalendarData/sr-Latn-RS/firstDayOfWeek=2 +# +CalendarData/sr-Latn/minimalDaysInFirstWeek=1 +CalendarData/sr-Latn-BA/minimalDaysInFirstWeek=4 +CalendarData/sr-Latn-ME/minimalDaysInFirstWeek=4 +CalendarData/sr-Latn-RS/minimalDaysInFirstWeek=4 +# +LocaleNames/sr-Latn/SR=Surinam +LocaleNames/sr-Latn-BA/SR=Surinam +LocaleNames/sr-Latn-ME/SR=Surinam +LocaleNames/sr-Latn-RS/SR=Surinam +# +FormatData/sr-Latn/MonthNames/2=mart +FormatData/sr-Latn-BA/MonthNames/4=maj +FormatData/sr-Latn-ME/MonthNames/7=avgust +FormatData/sr-Latn-RS/MonthNames/8=septembar +# +FormatData/sr-Latn/DayNames/1=ponedeljak +FormatData/sr-Latn-BA/DayNames/2=utorak +FormatData/sr-Latn-ME/DayNames/3=sreda +FormatData/sr-Latn-RS/DayNames/4=\u010detvrtak +# +FormatData/sr-Latn/DayAbbreviations/1=pon +FormatData/sr-Latn-BA/DayAbbreviations/2=uto +FormatData/sr-Latn-ME/DayAbbreviations/3=sre +FormatData/sr-Latn-RS/DayAbbreviations/4=\u010det +# +CurrencyNames/sr-Latn/EUR=EUR +CurrencyNames/sr-Latn-BA/EUR=\u20ac +CurrencyNames/sr-Latn-BA/BAM=KM +CurrencyNames/sr-Latn-ME/EUR=\u20ac +CurrencyNames/sr-Latn-RS/EUR=EUR +# +FormatData/sr-Latn/DateTimePatterns/1=HH.mm.ss z +FormatData/sr-Latn-BA/DateTimePatterns/2=HH.mm.ss +FormatData/sr-Latn-ME/DateTimePatterns/5=d.MM.yyyy. +FormatData/sr-Latn-RS/DateTimePatterns/5=dd. MMMM y. + +# bug 7019267 +CurrencyNames/pt/adp=Peseta de Andorra +CurrencyNames/pt/aed=Dir\u00e9m dos Emirados \u00c1rabes Unidos +CurrencyNames/pt/afa=Afegane (1927-2002) +CurrencyNames/pt/afn=Afegane +CurrencyNames/pt/all=Lek Alban\u00eas +CurrencyNames/pt/amd=Dram arm\u00eanio +CurrencyNames/pt/ang=Guilder das Antilhas Holandesas +CurrencyNames/pt/aoa=Cuanza angolano +CurrencyNames/pt/ars=Peso argentino +CurrencyNames/pt/ats=Xelim austr\u00edaco +CurrencyNames/pt/aud=D\u00f3lar australiano +CurrencyNames/pt/awg=Guilder de Aruba +CurrencyNames/pt/azm=Manat azerbaijano +CurrencyNames/pt/azn=Manat do Azerbaij\u00e3o +CurrencyNames/pt/bam=Marco b\u00f3snio-herzegovino convers\u00edvel +CurrencyNames/pt/bbd=D\u00f3lar de Barbados +CurrencyNames/pt/bdt=Taka de Bangladesh +CurrencyNames/pt/bef=Franco belga +CurrencyNames/pt/bgl=Lev forte b\u00falgaro +CurrencyNames/pt/bgn=Lev novo b\u00falgaro +CurrencyNames/pt/bhd=Dinar bareinita +CurrencyNames/pt/bif=Franco do Burundi +CurrencyNames/pt/bmd=D\u00f3lar das Bermudas +CurrencyNames/pt/bnd=D\u00f3lar do Brunei +CurrencyNames/pt/bov=Mvdol boliviano +CurrencyNames/pt/brl=Real brasileiro +CurrencyNames/pt/bsd=D\u00f3lar das Bahamas +CurrencyNames/pt/btn=Ngultrum do But\u00e3o +CurrencyNames/pt/bwp=Pula botsuanesa +CurrencyNames/pt/byb=Rublo novo bielo-russo (1994-1999) +CurrencyNames/pt/byr=Rublo bielo-russo +CurrencyNames/pt/bzd=D\u00f3lar do Belize +CurrencyNames/pt/cad=D\u00f3lar canadense +CurrencyNames/pt/cdf=Franco congol\u00eas +CurrencyNames/pt/chf=Franco su\u00ed\u00e7o +CurrencyNames/pt/clf=Unidades de Fomento chilenas +CurrencyNames/pt/clp=Peso chileno +CurrencyNames/pt/cny=Yuan Renminbi chin\u00eas +CurrencyNames/pt/cop=Peso colombiano +CurrencyNames/pt/crc=Colon da Costa Rica +CurrencyNames/pt/csd=Dinar s\u00e9rvio antigo +CurrencyNames/pt/cup=Peso cubano +CurrencyNames/pt/cve=Escudo cabo-verdiano +CurrencyNames/pt/cyp=Libra cipriota +CurrencyNames/pt/czk=Coroa checa +CurrencyNames/pt/dem=Marco alem\u00e3o +CurrencyNames/pt/djf=Franco do Djibuti +CurrencyNames/pt/dkk=Coroa dinamarquesa +CurrencyNames/pt/dop=Peso dominicano +CurrencyNames/pt/dzd=Dinar argelino +CurrencyNames/pt/eek=Coroa estoniana +CurrencyNames/pt/egp=Libra eg\u00edpcia +CurrencyNames/pt/ern=Nakfa da Eritreia +CurrencyNames/pt/esp=Peseta espanhola +CurrencyNames/pt/etb=Birr et\u00edope +CurrencyNames/pt/fim=Marca finlandesa +CurrencyNames/pt/fjd=D\u00f3lar de Fiji +CurrencyNames/pt/fkp=Libra das Malvinas +CurrencyNames/pt/frf=Franco franc\u00eas +CurrencyNames/pt/gbp=Libra esterlina brit\u00e2nica +CurrencyNames/pt/gel=Lari georgiano +CurrencyNames/pt/ghc=Cedi de Gana (1979-2007) +CurrencyNames/pt/ghs=Cedi gan\u00eas +CurrencyNames/pt/gip=Libra de Gibraltar +CurrencyNames/pt/gmd=Dalasi de G\u00e2mbia +CurrencyNames/pt/gnf=Franco de Guin\u00e9 +CurrencyNames/pt/grd=Dracma grego +CurrencyNames/pt/gtq=Quet\u00e7al da Guatemala +CurrencyNames/pt/gwp=Peso da Guin\u00e9-Bissau +CurrencyNames/pt/gyd=D\u00f3lar da Guiana +CurrencyNames/pt/hkd=D\u00f3lar de Hong Kong +CurrencyNames/pt/hnl=Lempira de Honduras +CurrencyNames/pt/hrk=Kuna croata +CurrencyNames/pt/htg=Gurde do Haiti +CurrencyNames/pt/huf=Forinte h\u00fangaro +CurrencyNames/pt/idr=Rupia indon\u00e9sia +CurrencyNames/pt/iep=Libra irlandesa +CurrencyNames/pt/ils=Sheqel Novo israelita +CurrencyNames/pt/inr=R\u00fapia indiana +CurrencyNames/pt/iqd=Dinar iraquiano +CurrencyNames/pt/irr=Rial iraniano +CurrencyNames/pt/isk=Coroa islandesa +CurrencyNames/pt/itl=Lira italiana +CurrencyNames/pt/jmd=D\u00f3lar jamaicano +CurrencyNames/pt/jod=Dinar jordaniano +CurrencyNames/pt/jpy=Iene japon\u00eas +CurrencyNames/pt/kes=Xelim queniano +CurrencyNames/pt/kgs=Som quirguiz +CurrencyNames/pt/khr=Riel cambojano +CurrencyNames/pt/kmf=Franco de Comores +CurrencyNames/pt/kpw=Won norte-coreano +CurrencyNames/pt/krw=Won sul-coreano +CurrencyNames/pt/kwd=Dinar coveitiano +CurrencyNames/pt/kyd=D\u00f3lar das Ilhas Caiman +CurrencyNames/pt/kzt=Tenge do Cazaquist\u00e3o +CurrencyNames/pt/lak=Kip de Laos +CurrencyNames/pt/lbp=Libra libanesa +CurrencyNames/pt/lkr=Rupia do Sri Lanka +CurrencyNames/pt/lrd=D\u00f3lar liberiano +CurrencyNames/pt/lsl=Loti do Lesoto +CurrencyNames/pt/ltl=Lita lituano +CurrencyNames/pt/luf=Franco luxemburgu\u00eas +CurrencyNames/pt/lvl=Lats let\u00e3o +CurrencyNames/pt/lyd=Dinar l\u00edbio +CurrencyNames/pt/mad=Dir\u00e9m marroquino +CurrencyNames/pt/mdl=Leu mold\u00e1vio +CurrencyNames/pt/mga=Ariary de Madagascar +CurrencyNames/pt/mgf=Franco de Madagascar +CurrencyNames/pt/mkd=Dinar maced\u00f4nio +CurrencyNames/pt/mmk=Kyat de Mianmar +CurrencyNames/pt/mnt=Tugrik mongol +CurrencyNames/pt/mop=Pataca macaense +CurrencyNames/pt/mro=Ouguiya da Maurit\u00e2nia +CurrencyNames/pt/mtl=Lira maltesa +CurrencyNames/pt/mur=Rupia de Maur\u00edcio +CurrencyNames/pt/mvr=Rupias das Ilhas Maldivas +CurrencyNames/pt/mwk=Cuacha do Mal\u00e1ui +CurrencyNames/pt/mxn=Peso mexicano +CurrencyNames/pt/mxv=Unidade Mexicana de Investimento (UDI) +CurrencyNames/pt/myr=Ringgit malaio +CurrencyNames/pt/mzm=Metical antigo de Mo\u00e7ambique +CurrencyNames/pt/mzn=Metical do Mo\u00e7ambique +CurrencyNames/pt/nad=D\u00f3lar da Nam\u00edbia +CurrencyNames/pt/ngn=Naira nigeriana +CurrencyNames/pt/nio=C\u00f3rdoba Ouro nicaraguense +CurrencyNames/pt/nlg=Florim holand\u00eas +CurrencyNames/pt/nok=Coroa norueguesa +CurrencyNames/pt/npr=Rupia nepalesa +CurrencyNames/pt/nzd=D\u00f3lar da Nova Zel\u00e2ndia +CurrencyNames/pt/omr=Rial de Om\u00e3 +CurrencyNames/pt/pab=Balboa panamenho +CurrencyNames/pt/pen=Sol Novo peruano +CurrencyNames/pt/pgk=Kina da Papua-Nova Guin\u00e9 +CurrencyNames/pt/php=Peso filipino +CurrencyNames/pt/pkr=Rupia paquistanesa +CurrencyNames/pt/pln=Zloti polon\u00eas +CurrencyNames/pt/pte=Escudo portugu\u00eas +CurrencyNames/pt/pyg=Guarani paraguaio +CurrencyNames/pt/qar=Rial catariano +CurrencyNames/pt/rol=Leu romeno antigo +CurrencyNames/pt/ron=Leu romeno +CurrencyNames/pt/rsd=Dinar s\u00e9rvio +CurrencyNames/pt/rub=Rublo russo +CurrencyNames/pt/rur=Rublo russo (1991-1998) +CurrencyNames/pt/rwf=Franco ruand\u00eas +CurrencyNames/pt/sar=Rial saudita +CurrencyNames/pt/sbd=D\u00f3lar das Ilhas Salom\u00e3o +CurrencyNames/pt/scr=Rupia das Seychelles +CurrencyNames/pt/sdd=Dinar sudan\u00eas +CurrencyNames/pt/sdg=Libra sudanesa +CurrencyNames/pt/sek=Coroa sueca +CurrencyNames/pt/sgd=D\u00f3lar de Cingapura +CurrencyNames/pt/shp=Libra de Santa Helena +CurrencyNames/pt/sit=Tolar Bons esloveno +CurrencyNames/pt/skk=Coroa eslovaca +CurrencyNames/pt/sll=Leone de Serra Leoa +CurrencyNames/pt/sos=Xelim somali +CurrencyNames/pt/srd=D\u00f3lar do Suriname +CurrencyNames/pt/srg=Florim do Suriname +CurrencyNames/pt/std=Dobra de S\u00e3o Tom\u00e9 e Pr\u00edncipe +CurrencyNames/pt/svc=Colom salvadorenho +CurrencyNames/pt/syp=Libra s\u00edria +CurrencyNames/pt/szl=Lilangeni da Suazil\u00e2ndia +CurrencyNames/pt/thb=Baht tailand\u00eas +CurrencyNames/pt/tjs=Somoni tadjique +CurrencyNames/pt/tmm=Manat do Turcomenist\u00e3o +CurrencyNames/pt/tnd=Dinar tunisiano +CurrencyNames/pt/top=Pa\u02bbanga de Tonga +CurrencyNames/pt/tpe=Escudo timorense +CurrencyNames/pt/trl=Lira turca antiga +CurrencyNames/pt/try=Lira turca +CurrencyNames/pt/ttd=D\u00f3lar de Trinidad e Tobago +CurrencyNames/pt/twd=D\u00f3lar Novo de Taiwan +CurrencyNames/pt/tzs=Xelim da Tanz\u00e2nia +CurrencyNames/pt/uah=Hryvnia ucraniano +CurrencyNames/pt/ugx=Xelim ugandense +CurrencyNames/pt/usd=D\u00f3lar norte-americano +CurrencyNames/pt/usn=D\u00f3lar norte-americano (Dia seguinte) +CurrencyNames/pt/uss=D\u00f3lar norte-americano (Mesmo dia) +CurrencyNames/pt/uyu=Peso uruguaio +CurrencyNames/pt/uzs=Sum do Usbequist\u00e3o +CurrencyNames/pt/veb=Bol\u00edvar venezuelano +CurrencyNames/pt/vef=Bol\u00edvar v enezuelano forte +CurrencyNames/pt/vnd=Dong vietnamita +CurrencyNames/pt/vuv=Vatu de Vanuatu +CurrencyNames/pt/wst=Tala samoano +CurrencyNames/pt/xaf=Franco CFA BEAC +CurrencyNames/pt/xag=Prata +CurrencyNames/pt/xau=Ouro +CurrencyNames/pt/xba=Unidade Composta Europeia +CurrencyNames/pt/xbb=Unidade Monet\u00e1ria Europeia +CurrencyNames/pt/xbc=Unidade de Conta Europeia (XBC) +CurrencyNames/pt/xbd=Unidade de Conta Europeia (XBD) +CurrencyNames/pt/xcd=D\u00f3lar do Caribe Oriental +CurrencyNames/pt/xdr=Direitos Especiais de Giro +CurrencyNames/pt/xfo=Franco-ouro franc\u00eas +CurrencyNames/pt/xfu=Franco UIC franc\u00eas +CurrencyNames/pt/xof=Franco CFA BCEAO +CurrencyNames/pt/xpd=Pal\u00e1dio +CurrencyNames/pt/xpf=Franco CFP +CurrencyNames/pt/xpt=Platina +CurrencyNames/pt/xts=C\u00f3digo de Moeda de Teste +CurrencyNames/pt/xxx=Moeda Desconhecida ou Inv\u00e1lida +CurrencyNames/pt/yer=Rial iemenita +CurrencyNames/pt/yum=Dinar noviy iugoslavo +CurrencyNames/pt/zar=Rand sul-africano +CurrencyNames/pt/zmk=Cuacha zambiano +CurrencyNames/pt/zwd=D\u00f3lar do Zimb\u00e1bue + +# bug 7020960 +CurrencyNames/sr_RS/RSD=\u0434\u0438\u043d.
--- a/test/sun/text/resources/LocaleDataTest.java Thu Mar 17 14:33:00 2011 -0700 +++ b/test/sun/text/resources/LocaleDataTest.java Mon Mar 21 11:42:38 2011 -0700 @@ -33,7 +33,7 @@ * 6379214 6485516 6486607 4225362 4494727 6533691 6531591 6531593 6570259 * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 - * 6919624 + * 6919624 6998391 7019267 7020960 * @summary Verify locale data * */ @@ -91,6 +91,10 @@ * LocaleNames/fr_FR/US=\u00c9tats-Unis * LocaleNames/fr_FR/FR=France</pre> * + * You can use language tag with '-' in locale field like this:<pre> + * LocaleNames/sr-Latn/SR=Surinam + * FormatData/sr-Latn-BA/DayNames/2=utorak</pre> + * * The command-line syntax of this test is * <tt>java LocaleDataTest [-w] [{ -s | <filename> }]</tt> * @@ -242,7 +246,9 @@ if (index == -1 || index + 1 == key.length()) throw new Exception("Malformed input file: \"" + key + "\" is missing locale name"); localeName = key.substring(oldIndex, index); - if (localeName.length() > 0) { + boolean use_tag = localeName.indexOf("-") != -1; + + if (use_tag == false && localeName.length() > 0) { language = localeName.substring(0, 2); if (localeName.length() > 3) { country = localeName.substring(3, 5); @@ -283,8 +289,14 @@ } else { fullName = "sun.text.resources." + rbName; } + Locale locale; + if (use_tag) { + locale = Locale.forLanguageTag(localeName); + } else { + locale = new Locale(language, country, variant); + } ResourceBundle bundle = ResourceBundle.getBundle(fullName, - new Locale(language, country, variant), + locale, ResourceBundle.Control.getNoFallbackControl(Control.FORMAT_DEFAULT)); resource = bundle.getObject(resTag); }