--- old/src/jdk.localedata/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java 2015-06-04 14:16:33.780843977 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/et/JavaTimeSupplementary_et.java 2015-06-04 14:16:33.461838724 -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,78 +73,289 @@ @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", "budistlik kalender" }, - { "calendarname.gregorian", + { "calendarname.gregorian", "Gregoriuse kalender" }, - { "calendarname.gregory", + { "calendarname.gregory", "Gregoriuse kalender" }, - { "calendarname.islamic", + { "calendarname.islamic", "islamikalender" }, - { "calendarname.islamic-civil", - "islami ilmalik kalender" }, - { "calendarname.islamicc", + { "calendarname.islamic-civil", "islami ilmalik kalender" }, - { "calendarname.japanese", + { "calendarname.japanese", "Jaapani kalender" }, - { "calendarname.roc", + { "calendarname.roc", "Hiina Vabariigi kalender" }, - { "field.dayperiod", + { "field.dayperiod", "enne/p\u00e4rast l\u00f5unat" }, - { "field.era", + { "field.era", "ajastu" }, - { "field.hour", + { "field.hour", "tund" }, - { "field.minute", + { "field.minute", "minut" }, - { "field.month", + { "field.month", "kuu" }, - { "field.second", + { "field.second", "sekund" }, - { "field.week", + { "field.week", "n\u00e4dal" }, - { "field.weekday", + { "field.weekday", "n\u00e4dalap\u00e4ev" }, - { "field.year", + { "field.year", "aasta" }, - { "field.zone", - "v\u00f6\u00f6nd" }, - { "java.time.long.Eras", - new String[] { + { "field.zone", + "ajav\u00f6\u00f6nd" }, + { "islamic.DatePatterns", + new String[] { + "EEEE, d. MMMM y GGGG", + "d. MMMM y GGGG", + "dd.MM.y GGGG", + "dd.MM.y G", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "P", + "E", + "T", + "K", + "N", + "R", + "L", + } + }, + { "islamic.DayNames", + new String[] { + "p\u00fchap\u00e4ev", + "esmasp\u00e4ev", + "teisip\u00e4ev", + "kolmap\u00e4ev", + "neljap\u00e4ev", + "reede", + "laup\u00e4ev", + } + }, + { "islamic.DayNarrows", + new String[] { + "P", + "E", + "T", + "K", + "N", + "R", + "L", + } + }, + { "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[] { + "H:mm.ss zzzz", + "H:mm.ss z", + "H:mm.ss", + "H:mm", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "dd.MM.y G", + "dd.MM.y GGGGG", + } + }, + { "java.time.islamic.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "dd.MM.y G", + "dd.MM.y GGGGG", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "dd.MM.y G", + "dd.MM.y GGGGG", + } + }, + { "java.time.long.Eras", + new String[] { "enne meie aega", "meie aja j\u00e4rgi", - } - }, - { "java.time.short.Eras", - new String[] { + } + }, + { "java.time.roc.DatePatterns", + new String[] { + "EEEE, d. MMMM y G", + "d. MMMM y G", + "dd.MM.y G", + "dd.MM.y GGGGG", + } + }, + { "java.time.short.Eras", + new String[] { "e.m.a.", "m.a.j.", - } - }, + } + }, + { "roc.DatePatterns", + new String[] { + "EEEE, d. MMMM y GGGG", + "d. MMMM y GGGG", + "dd.MM.y GGGG", + "dd.MM.y G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "P", + "E", + "T", + "K", + "N", + "R", + "L", + } + }, + { "roc.DayNames", + new String[] { + "p\u00fchap\u00e4ev", + "esmasp\u00e4ev", + "teisip\u00e4ev", + "kolmap\u00e4ev", + "neljap\u00e4ev", + "reede", + "laup\u00e4ev", + } + }, + { "roc.DayNarrows", + new String[] { + "P", + "E", + "T", + "K", + "N", + "R", + "L", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "jaan", + "veebr", + "m\u00e4rts", + "apr", + "mai", + "juuni", + "juuli", + "aug", + "sept", + "okt", + "nov", + "dets", + "", + } + }, + { "roc.MonthNames", + new String[] { + "jaanuar", + "veebruar", + "m\u00e4rts", + "aprill", + "mai", + "juuni", + "juuli", + "august", + "september", + "oktoober", + "november", + "detsember", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "J", + "V", + "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[] { + "H:mm.ss zzzz", + "H:mm.ss z", + "H:mm.ss", + "H:mm", + } + }, }; } -} +}