--- old/src/jdk.localedata/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java 2015-06-04 14:17:01.702303735 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/sr/JavaTimeSupplementary_sr_Latn.java 2015-06-04 14:17:01.387298547 -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,82 +73,324 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { - "Q1", - "Q2", - "Q3", - "Q4", - } - }, - { "QuarterNames", - new String[] { - "1. kvartal", - "2. kvartal", - "3. kvartal", - "4. kvartal", - } - }, - { "calendarname.buddhist", - "Budisti\u010dki kalendar" }, - { "calendarname.gregorian", - "Gregorijanski kalendar" }, - { "calendarname.gregory", - "Gregorijanski kalendar" }, - { "calendarname.islamic", - "Islamski kalendar" }, - { "calendarname.islamic-civil", - "Islamski civilni kalendar" }, - { "calendarname.islamicc", + { "QuarterAbbreviations", + new String[] { + "K1", + "K2", + "K3", + "K4", + } + }, + { "QuarterNames", + new String[] { + "Prvo tromese\u010dje", + "Drugo tromese\u010dje", + "Tre\u0107e tromese\u010dje", + "\u010cetvrto tromese\u010dje", + } + }, + { "calendarname.buddhist", + "budisti\u010dki kalendar" }, + { "calendarname.gregorian", + "gregorijanski kalendar" }, + { "calendarname.gregory", + "gregorijanski kalendar" }, + { "calendarname.islamic", + "islamski kalendar" }, + { "calendarname.islamic-civil", "Islamski civilni kalendar" }, - { "calendarname.japanese", - "Japanski kalendar" }, - { "calendarname.roc", - "Kalendar Republike Kine" }, - { "field.dayperiod", - "pre podne/ popodne" }, - { "field.era", + { "calendarname.japanese", + "japanski kalendar" }, + { "calendarname.roc", + "kalendar Republike Kine" }, + { "field.dayperiod", + "pre podne/po podne" }, + { "field.era", "era" }, - { "field.hour", - "\u010das" }, - { "field.minute", + { "field.hour", + "sat" }, + { "field.minute", "minut" }, - { "field.month", + { "field.month", "mesec" }, - { "field.second", + { "field.second", "sekund" }, - { "field.week", + { "field.week", "nedelja" }, - { "field.weekday", + { "field.weekday", "dan u nedelji" }, - { "field.year", + { "field.year", "godina" }, - { "field.zone", - "zona" }, - { "java.time.long.Eras", - new String[] { + { "field.zone", + "vremenska zona" }, + { "islamic.AmPmMarkers", + new String[] { + "pre podne", + "po podne", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "ned", + "pon", + "uto", + "sre", + "\u010det", + "pet", + "sub", + } + }, + { "islamic.DayNames", + new String[] { + "nedelja", + "ponedeljak", + "utorak", + "sreda", + "\u010detvrtak", + "petak", + "subota", + } + }, + { "islamic.DayNarrows", + new String[] { + "n", + "p", + "u", + "s", + "\u010d", + "p", + "s", + } + }, + { "islamic.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.MonthNames", + new String[] { + "Muraham", + "Safar", + "Rabi\u02bb I", + "Rabi\u02bb II", + "Jumada I", + "Jumada II", + "Ra\u0111ab", + "\u0160a\u02bbban", + "Ramadan", + "\u0160aval", + "Du\u02bbl-Ki\u02bbda", + "Du\u02bbl-hi\u0111a", + "", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "K1", + "K2", + "K3", + "K4", + } + }, + { "islamic.QuarterNames", + new String[] { + "Prvo tromese\u010dje", + "Drugo tromese\u010dje", + "Tre\u0107e tromese\u010dje", + "\u010cetvrto tromese\u010dje", + } + }, + { "islamic.long.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.narrow.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.short.Eras", + new String[] { + "", + "AH", + } + }, + { "java.time.buddhist.long.Eras", + new String[] { + "BC", + "BE", + } + }, + { "java.time.buddhist.short.Eras", + new String[] { + "BC", + "BE", + } + }, + { "java.time.japanese.long.Eras", + new String[] { + "Nove ere", + "Mei\u0111i", + "Tai\u0161o", + "\u0160ova", + "Haisei", + } + }, + { "java.time.japanese.short.Eras", + new String[] { + "n. e.", + "Mei\u0111i", + "Tai\u0161o", + "\u0160ova", + "Haisei", + } + }, + { "java.time.long.Eras", + new String[] { "Pre nove ere", "Nove ere", - } - }, - { "java.time.short.Eras", - new String[] { + } + }, + { "java.time.short.Eras", + new String[] { "p. n. e.", "n. e", - } - }, - { "roc.Eras", - new String[] { + } + }, + { "roc.AmPmMarkers", + new String[] { + "pre podne", + "po podne", + } + }, + { "roc.DayAbbreviations", + new String[] { + "ned", + "pon", + "uto", + "sre", + "\u010det", + "pet", + "sub", + } + }, + { "roc.DayNames", + new String[] { + "nedelja", + "ponedeljak", + "utorak", + "sreda", + "\u010detvrtak", + "petak", + "subota", + } + }, + { "roc.DayNarrows", + new String[] { + "n", + "p", + "u", + "s", + "\u010d", + "p", + "s", + } + }, + { "roc.Eras", + new String[] { + "Pre RK", + "RK", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "jan", + "feb", + "mar", + "apr", + "maj", + "jun", + "jul", + "avg", + "sep", + "okt", + "nov", + "dec", + "", + } + }, + { "roc.MonthNames", + new String[] { + "januar", + "februar", + "mart", + "april", + "maj", + "jun", + "jul", + "avgust", + "septembar", + "oktobar", + "novembar", + "decembar", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "j", + "f", + "m", + "a", + "m", + "j", + "j", + "a", + "s", + "o", + "n", + "d", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "K1", + "K2", + "K3", + "K4", + } + }, + { "roc.QuarterNames", + new String[] { + "Prvo tromese\u010dje", + "Drugo tromese\u010dje", + "Tre\u0107e tromese\u010dje", + "\u010cetvrto tromese\u010dje", + } + }, + { "roc.long.Eras", + new String[] { + "Pre RK", + "RK", + } + }, + { "roc.narrow.Eras", + new String[] { "Pre RK", "RK", - } - }, - { "roc.short.Eras", - new String[] { + } + }, + { "roc.short.Eras", + new String[] { "Pre RK", "RK", - } - }, + } + }, }; } -} +}