--- old/src/jdk.localedata/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java 2015-06-23 13:28:13.033732117 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/ca/JavaTimeSupplementary_ca.java 2015-06-23 13:28:12.764727763 -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. @@ -69,72 +73,325 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "1T", "2T", "3T", "4T", - } - }, - { "QuarterNames", - new String[] { + } + }, + { "QuarterNames", + new String[] { "1r trimestre", "2n trimestre", "3r trimestre", "4t trimestre", - } - }, - { "QuarterNarrows", - new String[] { - "1", - "2", - "3", - "4", - } - }, - { "calendarname.buddhist", + } + }, + { "calendarname.buddhist", "calendari budista" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "calendari gregori\u00e0" }, - { "calendarname.gregory", + { "calendarname.gregory", "calendari gregori\u00e0" }, - { "calendarname.islamic", + { "calendarname.islamic", "calendari musulm\u00e0" }, - { "calendarname.islamic-civil", - "calendari civil isl\u00e0mic" }, - { "calendarname.islamicc", + { "calendarname.islamic-civil", "calendari civil isl\u00e0mic" }, - { "calendarname.japanese", + { "calendarname.japanese", "calendari japon\u00e8s" }, - { "calendarname.roc", + { "calendarname.roc", "calendari de la Rep\u00fablica de Xina" }, - { "field.dayperiod", - "a.m./p.m." }, - { "field.era", + { "field.dayperiod", + "a. m./p. m." }, + { "field.era", "era" }, - { "field.hour", + { "field.hour", "hora" }, - { "field.minute", + { "field.minute", "minut" }, - { "field.month", + { "field.month", "mes" }, - { "field.second", + { "field.second", "segon" }, - { "field.week", + { "field.week", "setmana" }, - { "field.weekday", + { "field.weekday", "dia de la setmana" }, - { "field.year", + { "field.year", "any" }, - { "field.zone", + { "field.zone", "zona" }, - { "java.time.short.Eras", - new String[] { + { "islamic.AmPmMarkers", + new String[] { + "a. m.", + "p. m.", + } + }, + { "islamic.DatePatterns", + new String[] { + "EEEE d MMMM 'de' y GGGG", + "d MMMM 'de' y GGGG", + "dd/MM/y GGGG", + "dd/MM/yy G", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "dg.", + "dl.", + "dt.", + "dc.", + "dj.", + "dv.", + "ds.", + } + }, + { "islamic.DayNames", + new String[] { + "diumenge", + "dilluns", + "dimarts", + "dimecres", + "dijous", + "divendres", + "dissabte", + } + }, + { "islamic.DayNarrows", + new String[] { + "dg", + "dl", + "dt", + "dc", + "dj", + "dv", + "ds", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "1T", + "2T", + "3T", + "4T", + } + }, + { "islamic.QuarterNames", + new String[] { + "1r trimestre", + "2n trimestre", + "3r trimestre", + "4t trimestre", + } + }, + { "islamic.QuarterNarrows", + new String[] { + "1", + "2", + "3", + "4", + } + }, + { "islamic.TimePatterns", + new String[] { + "H:mm:ss zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "islamic.narrow.AmPmMarkers", + new String[] { + "a.m.", + "p.m.", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { + "EEEE, dd MMMM y G", + "d MMMM y G", + "d MMM y G", + "dd/MM/y GGGGG", + } + }, + { "java.time.buddhist.long.Eras", + new String[] { + "BC", + "eB", + } + }, + { "java.time.buddhist.short.Eras", + new String[] { + "BC", + "eB", + } + }, + { "java.time.islamic.DatePatterns", + new String[] { + "EEEE d MMMM 'de' y G", + "d MMMM 'de' y G", + "dd/MM/y G", + "dd/MM/yy GGGGG", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { + "EEEE d MMMM 'de' y G", + "d MMMM 'de' y G", + "dd/MM/y G", + "dd/MM/yy GGGGG", + } + }, + { "java.time.long.Eras", + new String[] { + "abans de Crist", + "despr\u00e9s de Crist", + } + }, + { "java.time.roc.DatePatterns", + new String[] { + "EEEE d MMMM 'de' y G", + "d MMMM 'de' y G", + "dd/MM/y G", + "dd/MM/y GGGGG", + } + }, + { "java.time.short.Eras", + new String[] { "aC", "dC", - } - }, + } + }, + { "roc.AmPmMarkers", + new String[] { + "a. m.", + "p. m.", + } + }, + { "roc.DatePatterns", + new String[] { + "EEEE d MMMM 'de' y GGGG", + "d MMMM 'de' y GGGG", + "dd/MM/y GGGG", + "dd/MM/y G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "dg.", + "dl.", + "dt.", + "dc.", + "dj.", + "dv.", + "ds.", + } + }, + { "roc.DayNames", + new String[] { + "diumenge", + "dilluns", + "dimarts", + "dimecres", + "dijous", + "divendres", + "dissabte", + } + }, + { "roc.DayNarrows", + new String[] { + "dg", + "dl", + "dt", + "dc", + "dj", + "dv", + "ds", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "gen.", + "febr.", + "mar\u00e7", + "abr.", + "maig", + "juny", + "jul.", + "ag.", + "set.", + "oct.", + "nov.", + "des.", + "", + } + }, + { "roc.MonthNames", + new String[] { + "de gener", + "de febrer", + "de mar\u00e7", + "d\u2019abril", + "de maig", + "de juny", + "de juliol", + "d\u2019agost", + "de setembre", + "d\u2019octubre", + "de novembre", + "de desembre", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "GN", + "FB", + "M\u00c7", + "AB", + "MG", + "JN", + "JL", + "AG", + "ST", + "OC", + "NV", + "DS", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "1T", + "2T", + "3T", + "4T", + } + }, + { "roc.QuarterNames", + new String[] { + "1r trimestre", + "2n trimestre", + "3r trimestre", + "4t trimestre", + } + }, + { "roc.TimePatterns", + new String[] { + "H:mm:ss zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "a.m.", + "p.m.", + } + }, }; } -} +}