--- old/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java 2015-06-04 14:16:03.147339547 -0700 +++ new/src/java.base/share/classes/sun/text/resources/en/JavaTimeSupplementary_en.java 2015-06-04 14:16:02.825334245 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,37 +26,41 @@ /* * 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. + * Copyright (C) 1991-2015 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, + * 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) this copyright and permission notice appear with all copies + * of the Data Files or Software, + * (b) this copyright and 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. + * 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. + * 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. */ // Note: this file has been generated by a tool. @@ -69,118 +73,250 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { - "Q1", - "Q2", - "Q3", - "Q4", - } - }, - { "QuarterNames", - new String[] { + { "QuarterNames", + new String[] { "1st quarter", "2nd quarter", "3rd quarter", "4th quarter", - } - }, - { "calendarname.buddhist", + } + }, + { "calendarname.buddhist", "Buddhist Calendar" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "Gregorian Calendar" }, - { "calendarname.gregory", + { "calendarname.gregory", "Gregorian Calendar" }, - { "calendarname.islamic", + { "calendarname.islamic", "Islamic Calendar" }, - { "calendarname.islamic-civil", - "Islamic-Civil Calendar" }, - { "calendarname.islamicc", - "Islamic-Civil Calendar" }, - { "calendarname.japanese", + { "calendarname.islamic-civil", + "Islamic Calendar (tabular, civil epoch)" }, + { "calendarname.islamic-umalqura", + "Islamic Calendar (Umm al-Qura)" }, + { "calendarname.japanese", "Japanese Calendar" }, - { "calendarname.roc", + { "calendarname.roc", "Minguo Calendar" }, - { "field.dayperiod", + { "field.dayperiod", "AM/PM" }, - { "field.era", - "Era" }, - { "field.hour", - "Hour" }, - { "field.minute", - "Minute" }, - { "field.month", - "Month" }, - { "field.second", - "Second" }, - { "field.week", - "Week" }, - { "field.weekday", - "Day of the Week" }, - { "field.year", - "Year" }, - { "field.zone", + { "field.zone", "Time Zone" }, - { "islamic.DatePatterns", - new String[] { + { "islamic.DatePatterns", + new String[] { "EEEE, MMMM d, y GGGG", "MMMM d, y GGGG", "MMM d, y GGGG", - "M/d/yy GGGG", - } - }, - { "java.time.buddhist.DatePatterns", - new String[] { + "M/d/y G", + } + }, + { "islamic.DayNames", + new String[] { + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "Q1", + "Q2", + "Q3", + "Q4", + } + }, + { "islamic.QuarterNames", + new String[] { + "1st quarter", + "2nd quarter", + "3rd quarter", + "4th quarter", + } + }, + { "islamic.TimePatterns", + new String[] { + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", - "M/d/yy GGGGG", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { + "M/d/y GGGGG", + } + }, + { "java.time.buddhist.short.Eras", + new String[] { + "BC", + "BE", + } + }, + { "java.time.islamic.DatePatterns", + new String[] { "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", - "M/d/yy G", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { + "M/d/y GGGGG", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", - "M/d/yy GGGGG", - } - }, - { "java.time.long.Eras", - new String[] { + "M/d/y GGGGG", + } + }, + { "java.time.long.Eras", + new String[] { "Before Christ", "Anno Domini", - } - }, - { "java.time.roc.DatePatterns", - new String[] { + } + }, + { "java.time.roc.DatePatterns", + new String[] { "EEEE, MMMM d, y G", "MMMM d, y G", "MMM d, y G", - "M/d/yy GGGGG", - } - }, - { "java.time.short.Eras", - new String[] { - "BC", - "AD", - } - }, - { "roc.DatePatterns", - new String[] { + "M/d/y GGGGG", + } + }, + { "roc.DatePatterns", + new String[] { "EEEE, MMMM d, y GGGG", "MMMM d, y GGGG", "MMM d, y GGGG", - "M/d/yy G", - } - }, + "M/d/y G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + } + }, + { "roc.DayNames", + new String[] { + "Sunday", + "Monday", + "Tuesday", + "Wednesday", + "Thursday", + "Friday", + "Saturday", + } + }, + { "roc.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "Jan", + "Feb", + "Mar", + "Apr", + "May", + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + "", + } + }, + { "roc.MonthNames", + new String[] { + "January", + "February", + "March", + "April", + "May", + "June", + "July", + "August", + "September", + "October", + "November", + "December", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "Q1", + "Q2", + "Q3", + "Q4", + } + }, + { "roc.QuarterNames", + new String[] { + "1st quarter", + "2nd quarter", + "3rd quarter", + "4th quarter", + } + }, + { "roc.TimePatterns", + new String[] { + "h:mm:ss a zzzz", + "h:mm:ss a z", + "h:mm:ss a", + "h:mm a", + } + }, + { "roc.long.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.narrow.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.short.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, }; } -} +}