--- old/src/jdk.localedata/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java 2015-06-04 14:16:40.518954929 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/is/JavaTimeSupplementary_is.java 2015-06-04 14:16:40.204949758 -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,72 +73,313 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "F1", "F2", "F3", "F4", - } - }, - { "QuarterNames", - new String[] { - "1st fj\u00f3r\u00f0ungur", - "2nd fj\u00f3r\u00f0ungur", - "3rd fj\u00f3r\u00f0ungur", - "4th fj\u00f3r\u00f0ungur", - } - }, - { "QuarterNarrows", - new String[] { - "1", - "2", - "3", - "4", - } - }, - { "calendarname.buddhist", + } + }, + { "QuarterNames", + new String[] { + "1. fj\u00f3r\u00f0ungur", + "2. fj\u00f3r\u00f0ungur", + "3. fj\u00f3r\u00f0ungur", + "4. fj\u00f3r\u00f0ungur", + } + }, + { "calendarname.buddhist", "B\u00fadd\u00edskt dagatal" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "Gregor\u00edskt dagatal" }, - { "calendarname.gregory", + { "calendarname.gregory", "Gregor\u00edskt dagatal" }, - { "calendarname.islamic", + { "calendarname.islamic", "\u00cdslamskt dagatal" }, - { "calendarname.islamic-civil", + { "calendarname.islamic-civil", "\u00cdslamskt borgaradagatal" }, - { "calendarname.islamicc", - "\u00cdslamskt borgaradagatal" }, - { "calendarname.japanese", + { "calendarname.japanese", "Japanskt dagatal" }, - { "calendarname.roc", - "k\u00ednverskt dagatal" }, - { "field.dayperiod", + { "calendarname.roc", + "Minguo dagatal" }, + { "field.dayperiod", "f.h./e.h." }, - { "field.era", + { "field.era", "t\u00edmabil" }, - { "field.hour", + { "field.hour", "klukkustund" }, - { "field.minute", + { "field.minute", "m\u00edn\u00fata" }, - { "field.month", + { "field.month", "m\u00e1nu\u00f0ur" }, - { "field.second", + { "field.second", "sek\u00fanda" }, - { "field.week", + { "field.week", "vika" }, - { "field.weekday", + { "field.weekday", "vikudagur" }, - { "field.year", + { "field.year", "\u00e1r" }, - { "field.zone", - "sv\u00e6\u00f0i" }, - { "java.time.short.Eras", - new String[] { + { "field.zone", + "t\u00edmabelti" }, + { "islamic.AmPmMarkers", + new String[] { + "f.h.", + "e.h.", + } + }, + { "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[] { + "sun.", + "m\u00e1n.", + "\u00feri.", + "mi\u00f0.", + "fim.", + "f\u00f6s.", + "lau.", + } + }, + { "islamic.DayNames", + new String[] { + "sunnudagur", + "m\u00e1nudagur", + "\u00feri\u00f0judagur", + "mi\u00f0vikudagur", + "fimmtudagur", + "f\u00f6studagur", + "laugardagur", + } + }, + { "islamic.DayNarrows", + new String[] { + "S", + "M", + "\u00de", + "M", + "F", + "F", + "L", + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "F1", + "F2", + "F3", + "F4", + } + }, + { "islamic.QuarterNames", + new String[] { + "1. fj\u00f3r\u00f0ungur", + "2. fj\u00f3r\u00f0ungur", + "3. fj\u00f3r\u00f0ungur", + "4. fj\u00f3r\u00f0ungur", + } + }, + { "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.narrow.AmPmMarkers", + new String[] { + "f.", + "e.", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "d.M.y G", + "d.M.y GGGGG", + } + }, + { "java.time.islamic.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "d.M.y G", + "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 GGGGG", + } + }, + { "java.time.long.Eras", + new String[] { "fyrir Krist", "eftir Krist", - } - }, + } + }, + { "java.time.roc.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "d.M.y G", + "d.M.y GGGGG", + } + }, + { "java.time.short.Eras", + new String[] { + "f.Kr.", + "e.Kr.", + } + }, + { "roc.AmPmMarkers", + new String[] { + "f.h.", + "e.h.", + } + }, + { "roc.DatePatterns", + new String[] { + "EEEE, d. MMMM y GGGG", + "d. MMMM y GGGG", + "d.M.y GGGG", + "d.M.y G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "sun.", + "m\u00e1n.", + "\u00feri.", + "mi\u00f0.", + "fim.", + "f\u00f6s.", + "lau.", + } + }, + { "roc.DayNames", + new String[] { + "sunnudagur", + "m\u00e1nudagur", + "\u00feri\u00f0judagur", + "mi\u00f0vikudagur", + "fimmtudagur", + "f\u00f6studagur", + "laugardagur", + } + }, + { "roc.DayNarrows", + new String[] { + "S", + "M", + "\u00de", + "M", + "F", + "F", + "L", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "jan.", + "feb.", + "mar.", + "apr.", + "ma\u00ed", + "j\u00fan.", + "j\u00fal.", + "\u00e1g\u00fa.", + "sep.", + "okt.", + "n\u00f3v.", + "des.", + "", + } + }, + { "roc.MonthNames", + new String[] { + "jan\u00faar", + "febr\u00faar", + "mars", + "apr\u00edl", + "ma\u00ed", + "j\u00fan\u00ed", + "j\u00fal\u00ed", + "\u00e1g\u00fast", + "september", + "okt\u00f3ber", + "n\u00f3vember", + "desember", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "\u00c1", + "S", + "O", + "N", + "D", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "F1", + "F2", + "F3", + "F4", + } + }, + { "roc.QuarterNames", + new String[] { + "1. fj\u00f3r\u00f0ungur", + "2. fj\u00f3r\u00f0ungur", + "3. fj\u00f3r\u00f0ungur", + "4. fj\u00f3r\u00f0ungur", + } + }, + { "roc.TimePatterns", + new String[] { + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "f.", + "e.", + } + }, }; } -} +}