--- old/src/jdk.localedata/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java 2015-06-04 14:16:56.260214126 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/ru/JavaTimeSupplementary_ru.java 2015-06-04 14:16:55.937208807 -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. + * 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, + * 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,76 +73,101 @@ @Override protected final Object[][] getContents() { return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "1-\u0439 \u043a\u0432.", "2-\u0439 \u043a\u0432.", "3-\u0439 \u043a\u0432.", "4-\u0439 \u043a\u0432.", - } - }, - { "QuarterNames", - new String[] { + } + }, + { "QuarterNames", + new String[] { "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", - } - }, - { "QuarterNarrows", - new String[] { - "1", - "2", - "3", - "4", - } - }, - { "calendarname.buddhist", - "\u0411\u0443\u0434\u0434\u0438\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.gregorian", - "\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.gregory", - "\u0413\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.islamic", - "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.islamic-civil", + } + }, + { "calendarname.buddhist", + "\u0431\u0443\u0434\u0434\u0438\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, + { "calendarname.gregorian", + "\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, + { "calendarname.gregory", + "\u0433\u0440\u0438\u0433\u043e\u0440\u0438\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, + { "calendarname.islamic", + "\u0438\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, + { "calendarname.islamic-civil", "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.islamicc", - "\u0418\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.japanese", - "\u042f\u043f\u043e\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "calendarname.roc", - "\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, - { "field.dayperiod", + { "calendarname.islamic-umalqura", + "\u0438\u0441\u043b\u0430\u043c\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c (\u0423\u043c\u043c \u0430\u043b\u044c-\u041a\u0443\u0440\u0430)" }, + { "calendarname.japanese", + "\u044f\u043f\u043e\u043d\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, + { "calendarname.roc", + "\u043a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439 \u043a\u0430\u043b\u0435\u043d\u0434\u0430\u0440\u044c" }, + { "field.dayperiod", "\u0414\u041f/\u041f\u041f" }, - { "field.era", + { "field.era", "\u042d\u0440\u0430" }, - { "field.hour", + { "field.hour", "\u0427\u0430\u0441" }, - { "field.minute", + { "field.minute", "\u041c\u0438\u043d\u0443\u0442\u0430" }, - { "field.month", + { "field.month", "\u041c\u0435\u0441\u044f\u0446" }, - { "field.second", + { "field.second", "\u0421\u0435\u043a\u0443\u043d\u0434\u0430" }, - { "field.week", + { "field.week", "\u041d\u0435\u0434\u0435\u043b\u044f" }, - { "field.weekday", + { "field.weekday", "\u0414\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438" }, - { "field.year", + { "field.year", "\u0413\u043e\u0434" }, - { "field.zone", + { "field.zone", "\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441" }, - { "islamic.DatePatterns", - new String[] { - "EEEE, d MMMM y\u00a0'\u0433'. GGGG", - "d MMMM y\u00a0'\u0433'. GGGG", - "dd.MM.yyyy GGGG", - "dd.MM.yy GGGG", - } - }, - { "islamic.MonthAbbreviations", - new String[] { + { "islamic.DatePatterns", + new String[] { + "EEEE, d MMMM y '\u0433'. GGGG", + "d MMMM y '\u0433'. GGGG", + "d MMM y '\u0433'. GGGG", + "dd.MM.y GGGG", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "\u0432\u0441", + "\u043f\u043d", + "\u0432\u0442", + "\u0441\u0440", + "\u0447\u0442", + "\u043f\u0442", + "\u0441\u0431", + } + }, + { "islamic.DayNames", + new String[] { + "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435", + "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a", + "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", + "\u0441\u0440\u0435\u0434\u0430", + "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", + "\u043f\u044f\u0442\u043d\u0438\u0446\u0430", + "\u0441\u0443\u0431\u0431\u043e\u0442\u0430", + } + }, + { "islamic.DayNarrows", + new String[] { + "\u0432\u0441", + "\u043f\u043d", + "\u0432\u0442", + "\u0441\u0440", + "\u0447\u0442", + "\u043f\u0442", + "\u0441\u0431", + } + }, + { "islamic.MonthAbbreviations", + new String[] { "\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c", "\u0421\u0430\u0444\u0430\u0440", "\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c", @@ -152,10 +181,10 @@ "\u0417\u0443\u043b\u044c-\u041a\u0430\u0430\u0434\u0430", "\u0417\u0443\u043b\u044c-\u0425\u0438\u0434\u0436\u0436\u0430", "", - } - }, - { "islamic.MonthNames", - new String[] { + } + }, + { "islamic.MonthNames", + new String[] { "\u041c\u0443\u0445\u0430\u0440\u0440\u0430\u043c", "\u0421\u0430\u0444\u0430\u0440", "\u0420\u0430\u0431\u0438-\u0443\u043b\u044c-\u0430\u0432\u0432\u0430\u043b\u044c", @@ -169,95 +198,266 @@ "\u0417\u0443\u043b\u044c-\u041a\u0430\u0430\u0434\u0430", "\u0417\u0443\u043b\u044c-\u0425\u0438\u0434\u0436\u0436\u0430", "", - } - }, - { "islamic.MonthNarrows", - new String[] { + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "1-\u0439 \u043a\u0432.", + "2-\u0439 \u043a\u0432.", + "3-\u0439 \u043a\u0432.", + "4-\u0439 \u043a\u0432.", + } + }, + { "islamic.QuarterNames", + new String[] { + "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + } + }, + { "islamic.QuarterNarrows", + new String[] { "1", "2", "3", "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "", - } - }, - { "java.time.buddhist.DatePatterns", - new String[] { - "EEEE, d MMMM y\u00a0'\u0433'. G", - "d MMMM y\u00a0'\u0433'. G", - "dd.MM.yyyy G", - "dd.MM.yy G", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { - "EEEE, d MMMM y\u00a0'\u0433'. G", - "d MMMM y\u00a0'\u0433'. G", - "dd.MM.yyyy G", - "dd.MM.yy G", - } - }, - { "java.time.japanese.DatePatterns", - new String[] { - "EEEE, d MMMM y\u00a0'\u0433'. G", - "d MMMM y\u00a0'\u0433'. G", - "dd.MM.yyyy G", - "dd.MM.yy G", - } - }, - { "java.time.japanese.long.Eras", - new String[] { - "\u043d.\u044d.", + } + }, + { "islamic.TimePatterns", + new String[] { + "H:mm:ss zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "islamic.narrow.AmPmMarkers", + new String[] { + "AM", + "PM", + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { + "EEEE, d MMMM y '\u0433'. G", + "d MMMM y '\u0433'. G", + "d MMM y '\u0433'. G", + "dd.MM.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 '\u0433'. G", + "d MMMM y '\u0433'. G", + "d MMM y '\u0433'. G", + "dd.MM.y G", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { + "EEEE, d MMMM y '\u0433'. G", + "d MMMM y '\u0433'. G", + "d MMM y '\u0433'. G", + "dd.MM.y G", + } + }, + { "java.time.japanese.long.Eras", + new String[] { + "\u043d. \u044d.", "\u042d\u043f\u043e\u0445\u0430 \u041c\u044d\u0439\u0434\u0437\u0438", "\u042d\u043f\u043e\u0445\u0430 \u0422\u0430\u0439\u0441\u044c\u043e", "\u0421\u044c\u043e\u0432\u0430", "\u042d\u043f\u043e\u0445\u0430 \u0425\u044d\u0439\u0441\u044d\u0439", - } - }, - { "java.time.japanese.short.Eras", - new String[] { - "\u043d.\u044d.", + } + }, + { "java.time.japanese.short.Eras", + new String[] { + "\u043d. \u044d.", "\u042d\u043f\u043e\u0445\u0430 \u041c\u044d\u0439\u0434\u0437\u0438", "\u042d\u043f\u043e\u0445\u0430 \u0422\u0430\u0439\u0441\u044c\u043e", "\u0421\u044c\u043e\u0432\u0430", "\u042d\u043f\u043e\u0445\u0430 \u0425\u044d\u0439\u0441\u044d\u0439", - } - }, - { "java.time.long.Eras", - new String[] { - "\u0434\u043e \u043d.\u044d.", - "\u043d.\u044d.", - } - }, - { "java.time.roc.DatePatterns", - new String[] { - "EEEE, d MMMM y\u00a0'\u0433'. G", - "d MMMM y\u00a0'\u0433'. G", - "dd.MM.yyyy G", - "dd.MM.yy G", - } - }, - { "java.time.short.Eras", - new String[] { + } + }, + { "java.time.long.Eras", + new String[] { + "\u0434\u043e \u043d. \u044d.", + "\u043d. \u044d.", + } + }, + { "java.time.roc.DatePatterns", + new String[] { + "EEEE, d MMMM y '\u0433'. G", + "d MMMM y '\u0433'. G", + "d MMM y '\u0433'. G", + "dd.MM.y G", + } + }, + { "java.time.short.Eras", + new String[] { "\u0434\u043e \u043d.\u044d.", "\u043d.\u044d.", - } - }, - { "roc.DatePatterns", - new String[] { - "EEEE, d MMMM y\u00a0'\u0433'. GGGG", - "d MMMM y\u00a0'\u0433'. GGGG", - "dd.MM.yyyy GGGG", - "dd.MM.yy GGGG", - } - }, + } + }, + { "roc.DatePatterns", + new String[] { + "EEEE, d MMMM y '\u0433'. GGGG", + "d MMMM y '\u0433'. GGGG", + "d MMM y '\u0433'. GGGG", + "dd.MM.y GGGG", + } + }, + { "roc.DayAbbreviations", + new String[] { + "\u0432\u0441", + "\u043f\u043d", + "\u0432\u0442", + "\u0441\u0440", + "\u0447\u0442", + "\u043f\u0442", + "\u0441\u0431", + } + }, + { "roc.DayNames", + new String[] { + "\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435", + "\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a", + "\u0432\u0442\u043e\u0440\u043d\u0438\u043a", + "\u0441\u0440\u0435\u0434\u0430", + "\u0447\u0435\u0442\u0432\u0435\u0440\u0433", + "\u043f\u044f\u0442\u043d\u0438\u0446\u0430", + "\u0441\u0443\u0431\u0431\u043e\u0442\u0430", + } + }, + { "roc.DayNarrows", + new String[] { + "\u0432\u0441", + "\u043f\u043d", + "\u0432\u0442", + "\u0441\u0440", + "\u0447\u0442", + "\u043f\u0442", + "\u0441\u0431", + } + }, + { "roc.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "\u044f\u043d\u0432.", + "\u0444\u0435\u0432\u0440.", + "\u043c\u0430\u0440\u0442\u0430", + "\u0430\u043f\u0440.", + "\u043c\u0430\u044f", + "\u0438\u044e\u043d\u044f", + "\u0438\u044e\u043b\u044f", + "\u0430\u0432\u0433.", + "\u0441\u0435\u043d\u0442.", + "\u043e\u043a\u0442.", + "\u043d\u043e\u044f\u0431.", + "\u0434\u0435\u043a.", + "", + } + }, + { "roc.MonthNames", + new String[] { + "\u044f\u043d\u0432\u0430\u0440\u044f", + "\u0444\u0435\u0432\u0440\u0430\u043b\u044f", + "\u043c\u0430\u0440\u0442\u0430", + "\u0430\u043f\u0440\u0435\u043b\u044f", + "\u043c\u0430\u044f", + "\u0438\u044e\u043d\u044f", + "\u0438\u044e\u043b\u044f", + "\u0430\u0432\u0433\u0443\u0441\u0442\u0430", + "\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f", + "\u043e\u043a\u0442\u044f\u0431\u0440\u044f", + "\u043d\u043e\u044f\u0431\u0440\u044f", + "\u0434\u0435\u043a\u0430\u0431\u0440\u044f", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "\u042f", + "\u0424", + "\u041c", + "\u0410", + "\u041c", + "\u0418", + "\u0418", + "\u0410", + "\u0421", + "\u041e", + "\u041d", + "\u0414", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "1-\u0439 \u043a\u0432.", + "2-\u0439 \u043a\u0432.", + "3-\u0439 \u043a\u0432.", + "4-\u0439 \u043a\u0432.", + } + }, + { "roc.QuarterNames", + new String[] { + "1-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + "2-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + "3-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + "4-\u0439 \u043a\u0432\u0430\u0440\u0442\u0430\u043b", + } + }, + { "roc.TimePatterns", + new String[] { + "H:mm:ss zzzz", + "H:mm:ss z", + "H:mm:ss", + "H:mm", + } + }, + { "roc.long.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.narrow.AmPmMarkers", + new String[] { + "AM", + "PM", + } + }, + { "roc.narrow.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, + { "roc.short.Eras", + new String[] { + "Before R.O.C.", + "Minguo", + } + }, }; } -} +}