--- old/src/jdk.localedata/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java 2015-06-04 14:16:38.123915492 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/hr/JavaTimeSupplementary_hr.java 2015-06-04 14:16:37.796910108 -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. @@ -68,123 +72,390 @@ public class JavaTimeSupplementary_hr extends OpenListResourceBundle { @Override protected final Object[][] getContents() { + final String[] javatimelongEras = { + "Prije Krista", + "Poslije Krista", + }; return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "1kv", "2kv", "3kv", "4kv", - } - }, - { "QuarterNames", - new String[] { + } + }, + { "QuarterNames", + new String[] { "1. kvartal", "2. kvartal", "3. kvartal", "4. kvartal", - } - }, - { "QuarterNarrows", - new String[] { + } + }, + { "QuarterNarrows", + new String[] { "1.", "2.", "3.", "4.", - } - }, - { "calendarname.buddhist", + } + }, + { "calendarname.buddhist", "budisti\u010dki kalendar" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "gregorijanski kalendar" }, - { "calendarname.gregory", + { "calendarname.gregory", "gregorijanski kalendar" }, - { "calendarname.islamic", + { "calendarname.islamic", "islamski kalendar" }, - { "calendarname.islamic-civil", - "islamski civilni kalendar" }, - { "calendarname.islamicc", + { "calendarname.islamic-civil", "islamski civilni kalendar" }, - { "calendarname.japanese", + { "calendarname.japanese", "japanski kalendar" }, - { "calendarname.roc", + { "calendarname.roc", "kalendar Republike Kine" }, - { "field.dayperiod", - "dio dana" }, - { "field.era", - "era" }, - { "field.hour", - "sat" }, - { "field.minute", - "minuta" }, - { "field.month", - "mjesec" }, - { "field.second", - "sekunda" }, - { "field.week", - "tjedan" }, - { "field.weekday", - "dan u tjednu" }, - { "field.year", - "godina" }, - { "field.zone", - "zona" }, - { "java.time.buddhist.DatePatterns", - new String[] { + { "field.dayperiod", + "AM/PM" }, + { "field.hour", + "Sat" }, + { "field.minute", + "Minuta" }, + { "field.month", + "Mjesec" }, + { "field.second", + "Sekunda" }, + { "field.week", + "Tjedan" }, + { "field.weekday", + "Dan u tjednu" }, + { "field.year", + "Godina" }, + { "field.zone", + "Vremenska zona" }, + { "islamic.DatePatterns", + new String[] { + "EEEE, d. MMMM y. GGGG", + "d. MMMM y. GGGG", + "d. M. y. GGGG", + "d.M.y. G", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "ned", + "pon", + "uto", + "sri", + "\u010det", + "pet", + "sub", + } + }, + { "islamic.DayNames", + new String[] { + "nedjelja", + "ponedjeljak", + "utorak", + "srijeda", + "\u010detvrtak", + "petak", + "subota", + } + }, + { "islamic.DayNarrows", + new String[] { + "N", + "P", + "U", + "S", + "\u010c", + "P", + "S", + } + }, + { "islamic.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "1kv", + "2kv", + "3kv", + "4kv", + } + }, + { "islamic.QuarterNames", + new String[] { + "1. kvartal", + "2. kvartal", + "3. kvartal", + "4. kvartal", + } + }, + { "islamic.QuarterNarrows", + new String[] { + "1.", + "2.", + "3.", + "4.", + } + }, + { "islamic.TimePatterns", + new String[] { + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + } + }, + { "islamic.long.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.narrow.AmPmMarkers", + new String[] { + "AM", + "PM", + } + }, + { "islamic.narrow.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.short.Eras", + new String[] { + "", + "AH", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { "EEEE, d. MMMM y. G", "d. MMMM y. G", "d. M. y. G", - "d.M.y.", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { + "dd.MM.y. 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. MMMM y. G", "d. MMMM y. G", "d. M. y. G", - "d.M.y. G", - } - }, - { "java.time.long.Eras", - new String[] { - "Prije Krista", - "Poslije Krista", - } - }, - { "java.time.roc.DatePatterns", - new String[] { + "d.M.y. GGGGG", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "EEEE, d. MMMM y. G", "d. MMMM y. G", "d. M. y. G", - "d.M.y. G", - } - }, - { "java.time.short.Eras", - new String[] { - "Prije Krista", + "d.M.y. GGGGG", + } + }, + { "java.time.japanese.long.Eras", + new String[] { "Poslije Krista", - } - }, - { "roc.DatePatterns", - new String[] { + "Meiji", + "Taish\u014d", + "Sh\u014dwa", + "Heisei", + } + }, + { "java.time.japanese.short.Eras", + new String[] { + "p. Kr.", + "Meiji", + "Taish\u014d", + "Sh\u014dwa", + "Heisei", + } + }, + { "java.time.long.Eras", + javatimelongEras }, + { "java.time.roc.DatePatterns", + new String[] { + "EEEE, d. MMMM y. G", + "d. MMMM y. G", + "d. M. y. G", + "dd.MM.y. GGGGG", + } + }, + { "java.time.short.Eras", + javatimelongEras }, + { "roc.DatePatterns", + new String[] { "EEEE, d. MMMM y. GGGG", "d. MMMM y. GGGG", "d. M. y. GGGG", - "d.M.y. GGGG", - } - }, - { "roc.Eras", - new String[] { + "dd.MM.y. G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "ned", + "pon", + "uto", + "sri", + "\u010det", + "pet", + "sub", + } + }, + { "roc.DayNames", + new String[] { + "nedjelja", + "ponedjeljak", + "utorak", + "srijeda", + "\u010detvrtak", + "petak", + "subota", + } + }, + { "roc.DayNarrows", + new String[] { + "N", + "P", + "U", + "S", + "\u010c", + "P", + "S", + } + }, + { "roc.Eras", + new String[] { + "prije R.O.C.", + "R.O.C.", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "sij", + "velj", + "o\u017eu", + "tra", + "svi", + "lip", + "srp", + "kol", + "ruj", + "lis", + "stu", + "pro", + "", + } + }, + { "roc.MonthNames", + new String[] { + "sije\u010dnja", + "velja\u010de", + "o\u017eujka", + "travnja", + "svibnja", + "lipnja", + "srpnja", + "kolovoza", + "rujna", + "listopada", + "studenoga", + "prosinca", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "1.", + "2.", + "3.", + "4.", + "5.", + "6.", + "7.", + "8.", + "9.", + "10.", + "11.", + "12.", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "1kv", + "2kv", + "3kv", + "4kv", + } + }, + { "roc.QuarterNames", + new String[] { + "1. kvartal", + "2. kvartal", + "3. kvartal", + "4. kvartal", + } + }, + { "roc.QuarterNarrows", + new String[] { + "1.", + "2.", + "3.", + "4.", + } + }, + { "roc.TimePatterns", + new String[] { + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + } + }, + { "roc.long.Eras", + new String[] { + "prije R.O.C.", + "R.O.C.", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "AM", + "PM", + } + }, + { "roc.narrow.Eras", + new String[] { "prije R.O.C.", "R.O.C.", - } - }, - { "roc.short.Eras", - new String[] { + } + }, + { "roc.short.Eras", + new String[] { "prije R.O.C.", "R.O.C.", - } - }, + } + }, }; } -} +}