--- old/src/jdk.localedata/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java 2015-06-23 13:28:31.624032983 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/no/JavaTimeSupplementary_no.java 2015-06-23 13:28:31.363028759 -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,126 +73,363 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "K1", "K2", "K3", "K4", - } - }, - { "QuarterNames", - new String[] { + } + }, + { "QuarterNames", + new String[] { "1. kvartal", "2. kvartal", "3. kvartal", "4. kvartal", - } - }, - { "QuarterNarrows", - new String[] { - "1", - "2", - "3", - "4", - } - }, - { "calendarname.buddhist", + } + }, + { "calendarname.buddhist", "buddhistisk kalender" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "gregoriansk kalender" }, - { "calendarname.gregory", + { "calendarname.gregory", "gregoriansk kalender" }, - { "calendarname.islamic", + { "calendarname.islamic", "islamsk kalender" }, - { "calendarname.islamic-civil", - "islamsk sivil kalender" }, - { "calendarname.islamicc", + { "calendarname.islamic-civil", "islamsk sivil kalender" }, - { "calendarname.japanese", + { "calendarname.islamic-umalqura", + "islamsk kalender (Umm al-Qura)" }, + { "calendarname.japanese", "japansk kalender" }, - { "calendarname.roc", + { "calendarname.roc", "kalender for Republikken Kina" }, - { "field.dayperiod", + { "field.dayperiod", "AM/PM" }, - { "field.era", - "tidsalder" }, - { "field.hour", - "time" }, - { "field.minute", - "minutt" }, - { "field.month", - "m\u00e5ned" }, - { "field.second", - "sekund" }, - { "field.week", - "uke" }, - { "field.weekday", - "ukedag" }, - { "field.year", - "\u00e5r" }, - { "field.zone", - "sone" }, - { "islamic.DatePatterns", - new String[] { + { "field.era", + "Tidsalder" }, + { "field.hour", + "Time" }, + { "field.minute", + "Minutt" }, + { "field.month", + "M\u00e5ned" }, + { "field.second", + "Sekund" }, + { "field.week", + "Uke" }, + { "field.weekday", + "Ukedag" }, + { "field.year", + "\u00c5r" }, + { "field.zone", + "Tidssone" }, + { "islamic.AmPmMarkers", + new String[] { + "a.m.", + "p.m.", + } + }, + { "islamic.DatePatterns", + new String[] { "EEEE d. MMMM y GGGG", "d. MMMM y GGGG", "d. MMM y GGGG", - "d.M y GGGG", - } - }, - { "java.time.buddhist.DatePatterns", - new String[] { + "d.M. y GGGG", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "s\u00f8n.", + "man.", + "tir.", + "ons.", + "tor.", + "fre.", + "l\u00f8r.", + } + }, + { "islamic.DayNames", + new String[] { + "s\u00f8ndag", + "mandag", + "tirsdag", + "onsdag", + "torsdag", + "fredag", + "l\u00f8rdag", + } + }, + { "islamic.DayNarrows", + new String[] { + "S", + "M", + "T", + "O", + "T", + "F", + "L", + } + }, + { "islamic.Eras", + new String[] { + "", + "AH", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "K1", + "K2", + "K3", + "K4", + } + }, + { "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.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. MMM y G", - "d.M yyyy", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { + "d.M. y G", + } + }, + { "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. MMM y G", - "d.M y G", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { + "d.M. y G", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "EEEE d. MMMM y G", "d. MMMM y G", "d. MMM y G", "d.M y G", - } - }, - { "java.time.long.Eras", - new String[] { + } + }, + { "java.time.long.Eras", + new String[] { "f.Kr.", "e.Kr.", - } - }, - { "java.time.roc.DatePatterns", - new String[] { + } + }, + { "java.time.roc.DatePatterns", + new String[] { "EEEE d. MMMM y G", "d. MMMM y G", "d. MMM y G", - "d.M y G", - } - }, - { "java.time.short.Eras", - new String[] { + "d.M. y G", + } + }, + { "java.time.short.Eras", + new String[] { "f.Kr.", "e.Kr.", - } - }, - { "roc.DatePatterns", - new String[] { + } + }, + { "roc.AmPmMarkers", + new String[] { + "a.m.", + "p.m.", + } + }, + { "roc.DatePatterns", + new String[] { "EEEE d. MMMM y GGGG", "d. MMMM y GGGG", "d. MMM y GGGG", - "d.M y GGGG", - } - }, + "d.M. y GGGG", + } + }, + { "roc.DayAbbreviations", + new String[] { + "s\u00f8n.", + "man.", + "tir.", + "ons.", + "tor.", + "fre.", + "l\u00f8r.", + } + }, + { "roc.DayNames", + new String[] { + "s\u00f8ndag", + "mandag", + "tirsdag", + "onsdag", + "torsdag", + "fredag", + "l\u00f8rdag", + } + }, + { "roc.DayNarrows", + new String[] { + "S", + "M", + "T", + "O", + "T", + "F", + "L", + } + }, + { "roc.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "jan.", + "feb.", + "mar.", + "apr.", + "mai", + "jun.", + "jul.", + "aug.", + "sep.", + "okt.", + "nov.", + "des.", + "", + } + }, + { "roc.MonthNames", + new String[] { + "januar", + "februar", + "mars", + "april", + "mai", + "juni", + "juli", + "august", + "september", + "oktober", + "november", + "desember", + "", + } + }, + { "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[] { + "1. kvartal", + "2. kvartal", + "3. kvartal", + "4. kvartal", + } + }, + { "roc.TimePatterns", + new String[] { + "HH.mm.ss zzzz", + "HH.mm.ss z", + "HH.mm.ss", + "HH.mm", + } + }, + { "roc.long.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.narrow.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.short.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, }; } -} +}