--- old/src/jdk.localedata/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java 2015-06-23 13:28:17.222799912 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/es/JavaTimeSupplementary_es.java 2015-06-23 13:28:16.957795623 -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,138 +73,363 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "T1", "T2", "T3", "T4", - } - }, - { "QuarterNames", - new String[] { - "1er trimestre", - "2\u00ba trimestre", - "3er trimestre", - "4\u00ba trimestre", - } - }, - { "QuarterNarrows", - new String[] { - "1T", - "2T", - "3T", - "4T", - } - }, - { "calendarname.buddhist", + } + }, + { "QuarterNames", + new String[] { + "1.er trimestre", + "2.\u00ba trimestre", + "3.er trimestre", + "4.\u00ba trimestre", + } + }, + { "calendarname.buddhist", "calendario budista" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "calendario gregoriano" }, - { "calendarname.gregory", + { "calendarname.gregory", "calendario gregoriano" }, - { "calendarname.islamic", + { "calendarname.islamic", "calendario isl\u00e1mico" }, - { "calendarname.islamic-civil", - "calendario civil isl\u00e1mico" }, - { "calendarname.islamicc", + { "calendarname.islamic-civil", "calendario civil isl\u00e1mico" }, - { "calendarname.japanese", + { "calendarname.japanese", "calendario japon\u00e9s" }, - { "calendarname.roc", + { "calendarname.roc", "calendario de la Rep\u00fablica de China" }, - { "field.dayperiod", - "periodo del d\u00eda" }, - { "field.era", - "era" }, - { "field.hour", - "hora" }, - { "field.minute", - "minuto" }, - { "field.month", - "mes" }, - { "field.second", - "segundo" }, - { "field.week", - "semana" }, - { "field.weekday", - "d\u00eda de la semana" }, - { "field.year", - "a\u00f1o" }, - { "field.zone", - "zona" }, - { "islamic.DatePatterns", - new String[] { + { "field.dayperiod", + "a. m./p. m." }, + { "field.hour", + "Hora" }, + { "field.minute", + "Minuto" }, + { "field.month", + "Mes" }, + { "field.second", + "Segundo" }, + { "field.week", + "Semana" }, + { "field.weekday", + "D\u00eda de la semana" }, + { "field.year", + "A\u00f1o" }, + { "field.zone", + "Zona horaria" }, + { "islamic.AmPmMarkers", + new String[] { + "a. m.", + "p. m.", + } + }, + { "islamic.DatePatterns", + new String[] { "EEEE, d 'de' MMMM 'de' y GGGG", "d 'de' MMMM 'de' y GGGG", "dd/MM/y GGGG", - "dd/MM/y GGGG", - } - }, - { "java.time.buddhist.DatePatterns", - new String[] { + "dd/MM/yy G", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "dom.", + "lun.", + "mar.", + "mi\u00e9.", + "jue.", + "vie.", + "s\u00e1b.", + } + }, + { "islamic.DayNames", + new String[] { + "domingo", + "lunes", + "martes", + "mi\u00e9rcoles", + "jueves", + "viernes", + "s\u00e1bado", + } + }, + { "islamic.DayNarrows", + new String[] { + "D", + "L", + "M", + "X", + "J", + "V", + "S", + } + }, + { "islamic.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "T1", + "T2", + "T3", + "T4", + } + }, + { "islamic.QuarterNames", + new String[] { + "1.er trimestre", + "2.\u00ba trimestre", + "3.er trimestre", + "4.\u00ba trimestre", + } + }, + { "islamic.TimePatterns", + new String[] { + "H:mm:ss (zzzz)", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "islamic.long.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.narrow.AmPmMarkers", + new String[] { + "a.m.", + "p.m.", + } + }, + { "islamic.narrow.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.short.Eras", + new String[] { + "", + "AH", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "dd/MM/y G", - "dd/MM/y G", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { + "dd/MM/yy GGGGG", + } + }, + { "java.time.buddhist.long.Eras", + new String[] { + "BC", + "BE", + } + }, + { "java.time.buddhist.short.Eras", + new String[] { + "BC", + "BE", + } + }, + { "java.time.islamic.DatePatterns", + new String[] { "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "dd/MM/y G", - "dd/MM/y G", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { + "dd/MM/yy GGGGG", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "dd/MM/y G", - "dd/MM/y GGGGG", - } - }, - { "java.time.long.Eras", - new String[] { + "dd/MM/yy GGGGG", + } + }, + { "java.time.long.Eras", + new String[] { "antes de Cristo", - "anno D\u00f3mini", - } - }, - { "java.time.roc.DatePatterns", - new String[] { + "despu\u00e9s de Cristo", + } + }, + { "java.time.roc.DatePatterns", + new String[] { "EEEE, d 'de' MMMM 'de' y G", "d 'de' MMMM 'de' y G", "dd/MM/y G", - "dd/MM/y GGGGG", - } - }, - { "java.time.short.Eras", - new String[] { + "dd/MM/yy GGGGG", + } + }, + { "java.time.short.Eras", + new String[] { "antes de Cristo", "anno D\u00f3mini", - } - }, - { "roc.DatePatterns", - new String[] { + } + }, + { "roc.AmPmMarkers", + new String[] { + "a. m.", + "p. m.", + } + }, + { "roc.DatePatterns", + new String[] { "EEEE, d 'de' MMMM 'de' y GGGG", "d 'de' MMMM 'de' y GGGG", "dd/MM/y GGGG", - "dd/MM/y G", - } - }, - { "roc.Eras", - new String[] { + "dd/MM/yy G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "dom.", + "lun.", + "mar.", + "mi\u00e9.", + "jue.", + "vie.", + "s\u00e1b.", + } + }, + { "roc.DayNames", + new String[] { + "domingo", + "lunes", + "martes", + "mi\u00e9rcoles", + "jueves", + "viernes", + "s\u00e1bado", + } + }, + { "roc.DayNarrows", + new String[] { + "D", + "L", + "M", + "X", + "J", + "V", + "S", + } + }, + { "roc.Eras", + new String[] { + "antes de R.O.C.", + "", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "ene.", + "feb.", + "mar.", + "abr.", + "may.", + "jun.", + "jul.", + "ago.", + "sept.", + "oct.", + "nov.", + "dic.", + "", + } + }, + { "roc.MonthNames", + new String[] { + "enero", + "febrero", + "marzo", + "abril", + "mayo", + "junio", + "julio", + "agosto", + "septiembre", + "octubre", + "noviembre", + "diciembre", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "E", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "T1", + "T2", + "T3", + "T4", + } + }, + { "roc.QuarterNames", + new String[] { + "1.er trimestre", + "2.\u00ba trimestre", + "3.er trimestre", + "4.\u00ba trimestre", + } + }, + { "roc.TimePatterns", + new String[] { + "H:mm:ss (zzzz)", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "roc.long.Eras", + new String[] { + "antes de R.O.C.", + "", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "a.m.", + "p.m.", + } + }, + { "roc.narrow.Eras", + new String[] { "antes de R.O.C.", "", - } - }, - { "roc.short.Eras", - new String[] { + } + }, + { "roc.short.Eras", + new String[] { "antes de R.O.C.", "", - } - }, + } + }, }; } -} +}