--- old/src/jdk.localedata/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java 2015-06-23 13:28:24.868923656 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/ja/JavaTimeSupplementary_ja.java 2015-06-23 13:28:24.608919449 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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. @@ -68,69 +72,110 @@ public class JavaTimeSupplementary_ja extends OpenListResourceBundle { @Override protected final Object[][] getContents() { + final String[] javatimelongEras = { + "\u7d00\u5143\u524d", + "\u897f\u66a6", + }; return new Object[][] { - { "QuarterAbbreviations", - new String[] { - "Q1", - "Q2", - "Q3", - "Q4", - } - }, - { "QuarterNames", - new String[] { + { "QuarterNames", + new String[] { "\u7b2c1\u56db\u534a\u671f", "\u7b2c2\u56db\u534a\u671f", "\u7b2c3\u56db\u534a\u671f", "\u7b2c4\u56db\u534a\u671f", - } - }, - { "QuarterNarrows", - new String[] { - "1", - "2", - "3", - "4", - } - }, - { "calendarname.buddhist", + } + }, + { "calendarname.buddhist", "\u30bf\u30a4\u4ecf\u6559\u66a6" }, - { "calendarname.gregorian", - "\u897f\u66a6[\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6]" }, - { "calendarname.gregory", - "\u897f\u66a6[\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6]" }, - { "calendarname.islamic", + { "calendarname.gregorian", + "\u897f\u66a6(\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6)" }, + { "calendarname.gregory", + "\u897f\u66a6(\u30b0\u30ec\u30b4\u30ea\u30aa\u66a6)" }, + { "calendarname.islamic", "\u30a4\u30b9\u30e9\u30e0\u66a6" }, - { "calendarname.islamic-civil", - "\u592a\u967d\u30a4\u30b9\u30e9\u30e0\u66a6" }, - { "calendarname.islamicc", - "\u592a\u967d\u30a4\u30b9\u30e9\u30e0\u66a6" }, - { "calendarname.japanese", + { "calendarname.islamic-civil", + "\u30a4\u30b9\u30e9\u30e0\u6b74(\u5b9a\u5468\u671f\u3001\u516c\u6c11\u7d00\u5143)" }, + { "calendarname.islamic-umalqura", + "\u30a4\u30b9\u30e9\u30e0\u66a6(\u30a6\u30f3\u30e0\u30fb\u30a2\u30eb\u30af\u30e9\u30fc)" }, + { "calendarname.japanese", "\u548c\u66a6" }, - { "calendarname.roc", + { "calendarname.roc", "\u4e2d\u83ef\u6c11\u56fd\u66a6" }, - { "field.dayperiod", + { "field.dayperiod", "\u5348\u524d/\u5348\u5f8c" }, - { "field.era", + { "field.era", "\u6642\u4ee3" }, - { "field.hour", + { "field.hour", "\u6642" }, - { "field.minute", + { "field.minute", "\u5206" }, - { "field.month", + { "field.month", "\u6708" }, - { "field.second", + { "field.second", "\u79d2" }, - { "field.week", + { "field.week", "\u9031" }, - { "field.weekday", + { "field.weekday", "\u66dc\u65e5" }, - { "field.year", + { "field.year", "\u5e74" }, - { "field.zone", + { "field.zone", "\u30bf\u30a4\u30e0\u30be\u30fc\u30f3" }, - { "islamic.MonthAbbreviations", - new String[] { + { "islamic.AmPmMarkers", + new String[] { + "\u5348\u524d", + "\u5348\u5f8c", + } + }, + { "islamic.DatePatterns", + new String[] { + "GGGGy\u5e74M\u6708d\u65e5EEEE", + "GGGGy\u5e74M\u6708d\u65e5", + "GGGGy/MM/dd", + "GGGGy/MM/dd", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "\u65e5", + "\u6708", + "\u706b", + "\u6c34", + "\u6728", + "\u91d1", + "\u571f", + } + }, + { "islamic.DayNames", + new String[] { + "\u65e5\u66dc\u65e5", + "\u6708\u66dc\u65e5", + "\u706b\u66dc\u65e5", + "\u6c34\u66dc\u65e5", + "\u6728\u66dc\u65e5", + "\u91d1\u66dc\u65e5", + "\u571f\u66dc\u65e5", + } + }, + { "islamic.DayNarrows", + new String[] { + "\u65e5", + "\u6708", + "\u706b", + "\u6c34", + "\u6728", + "\u91d1", + "\u571f", + } + }, + { "islamic.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.MonthAbbreviations", + new String[] { "\u30e0\u30cf\u30c3\u30e9\u30e0", "\u30b5\u30d5\u30a2\u30eb", "\u30e9\u30d3\u30fc\u30fb\u30a6\u30eb\u30fb\u30a2\u30a6\u30ef\u30eb", @@ -144,10 +189,10 @@ "\u30ba\u30eb\u30fb\u30ab\u30a4\u30c0", "\u30ba\u30eb\u30fb\u30d2\u30c3\u30b8\u30e3", "", - } - }, - { "islamic.MonthNames", - new String[] { + } + }, + { "islamic.MonthNames", + new String[] { "\u30e0\u30cf\u30c3\u30e9\u30e0", "\u30b5\u30d5\u30a2\u30eb", "\u30e9\u30d3\u30fc\u30fb\u30a6\u30eb\u30fb\u30a2\u30a6\u30ef\u30eb", @@ -161,94 +206,282 @@ "\u30ba\u30eb\u30fb\u30ab\u30a4\u30c0", "\u30ba\u30eb\u30fb\u30d2\u30c3\u30b8\u30e3", "", - } - }, - { "java.time.buddhist.DatePatterns", - new String[] { + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "Q1", + "Q2", + "Q3", + "Q4", + } + }, + { "islamic.QuarterNames", + new String[] { + "\u7b2c1\u56db\u534a\u671f", + "\u7b2c2\u56db\u534a\u671f", + "\u7b2c3\u56db\u534a\u671f", + "\u7b2c4\u56db\u534a\u671f", + } + }, + { "islamic.QuarterNarrows", + new String[] { + "1", + "2", + "3", + "4", + } + }, + { "islamic.TimePatterns", + new String[] { + "H\u6642mm\u5206ss\u79d2 zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "islamic.long.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.narrow.AmPmMarkers", + new String[] { + "\u5348\u524d", + "\u5348\u5f8c", + } + }, + { "islamic.narrow.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.short.Eras", + new String[] { + "", + "AH", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { "GGGGy\u5e74M\u6708d\u65e5EEEE", "GGGGy\u5e74M\u6708d\u65e5", "Gy/MM/dd", "Gy/MM/dd", - } - }, - { "java.time.buddhist.long.Eras", - new String[] { + } + }, + { "java.time.buddhist.long.Eras", + new String[] { "BC", "\u4ecf\u66a6", - } - }, - { "java.time.buddhist.short.Eras", - new String[] { + } + }, + { "java.time.buddhist.short.Eras", + new String[] { "\u7d00\u5143\u524d", "\u4ecf\u66a6", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { + } + }, + { "java.time.islamic.DatePatterns", + new String[] { + "Gy\u5e74M\u6708d\u65e5EEEE", + "Gy\u5e74M\u6708d\u65e5", + "Gy/MM/dd", + "Gy/MM/dd", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "Gy'\u5e74'M'\u6708'd'\u65e5'", "GGGGGy.MM.dd", "GGGGGy.MM.dd", "GGGGGy.MM.dd", - } - }, - { "java.time.japanese.long.Eras", - new String[] { + } + }, + { "java.time.japanese.long.Eras", + new String[] { "\u897f\u66a6", "\u660e\u6cbb", "\u5927\u6b63", "\u662d\u548c", "\u5e73\u6210", - } - }, - { "java.time.japanese.short.Eras", - new String[] { + } + }, + { "java.time.japanese.short.Eras", + new String[] { "\u897f\u66a6", "\u660e\u6cbb", "\u5927\u6b63", "\u662d\u548c", "\u5e73\u6210", - } - }, - { "java.time.long.Eras", - new String[] { - "\u7d00\u5143\u524d", - "\u897f\u66a6", - } - }, - { "java.time.roc.DatePatterns", - new String[] { + } + }, + { "java.time.long.Eras", + javatimelongEras }, + { "java.time.roc.DatePatterns", + new String[] { "Gy\u5e74M\u6708d\u65e5EEEE", "Gy\u5e74M\u6708d\u65e5", "Gy/MM/dd", "Gy/MM/dd", - } - }, - { "java.time.short.Eras", - new String[] { - "\u7d00\u5143\u524d", - "\u897f\u66a6", - } - }, - { "roc.DatePatterns", - new String[] { + } + }, + { "java.time.short.Eras", + javatimelongEras }, + { "roc.AmPmMarkers", + new String[] { + "\u5348\u524d", + "\u5348\u5f8c", + } + }, + { "roc.DatePatterns", + new String[] { "GGGGy\u5e74M\u6708d\u65e5EEEE", "GGGGy\u5e74M\u6708d\u65e5", "GGGGy/MM/dd", "GGGGy/MM/dd", - } - }, - { "roc.Eras", - new String[] { + } + }, + { "roc.DayAbbreviations", + new String[] { + "\u65e5", + "\u6708", + "\u706b", + "\u6c34", + "\u6728", + "\u91d1", + "\u571f", + } + }, + { "roc.DayNames", + new String[] { + "\u65e5\u66dc\u65e5", + "\u6708\u66dc\u65e5", + "\u706b\u66dc\u65e5", + "\u6c34\u66dc\u65e5", + "\u6728\u66dc\u65e5", + "\u91d1\u66dc\u65e5", + "\u571f\u66dc\u65e5", + } + }, + { "roc.DayNarrows", + new String[] { + "\u65e5", + "\u6708", + "\u706b", + "\u6c34", + "\u6728", + "\u91d1", + "\u571f", + } + }, + { "roc.Eras", + new String[] { + "\u6c11\u56fd\u524d", + "\u6c11\u56fd", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "1\u6708", + "2\u6708", + "3\u6708", + "4\u6708", + "5\u6708", + "6\u6708", + "7\u6708", + "8\u6708", + "9\u6708", + "10\u6708", + "11\u6708", + "12\u6708", + "", + } + }, + { "roc.MonthNames", + new String[] { + "1\u6708", + "2\u6708", + "3\u6708", + "4\u6708", + "5\u6708", + "6\u6708", + "7\u6708", + "8\u6708", + "9\u6708", + "10\u6708", + "11\u6708", + "12\u6708", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "Q1", + "Q2", + "Q3", + "Q4", + } + }, + { "roc.QuarterNames", + new String[] { + "\u7b2c1\u56db\u534a\u671f", + "\u7b2c2\u56db\u534a\u671f", + "\u7b2c3\u56db\u534a\u671f", + "\u7b2c4\u56db\u534a\u671f", + } + }, + { "roc.TimePatterns", + new String[] { + "H\u6642mm\u5206ss\u79d2 zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "roc.long.Eras", + new String[] { + "\u6c11\u56fd\u524d", + "\u6c11\u56fd", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "\u5348\u524d", + "\u5348\u5f8c", + } + }, + { "roc.narrow.Eras", + new String[] { "\u6c11\u56fd\u524d", "\u6c11\u56fd", - } - }, - { "roc.short.Eras", - new String[] { + } + }, + { "roc.short.Eras", + new String[] { "\u6c11\u56fd\u524d", "\u6c11\u56fd", - } - }, + } + }, }; } -} +}