--- old/src/jdk.localedata/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java 2015-06-04 14:16:35.953879759 -0700 +++ new/src/jdk.localedata/share/classes/sun/text/resources/fr/JavaTimeSupplementary_fr.java 2015-06-04 14:16:35.635874522 -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. @@ -68,197 +72,380 @@ public class JavaTimeSupplementary_fr extends OpenListResourceBundle { @Override protected final Object[][] getContents() { + final String[] javatimebuddhistlongEras = { + "BC", + "\u00e8re bouddhiste", + }; return new Object[][] { - { "QuarterAbbreviations", - new String[] { + { "QuarterAbbreviations", + new String[] { "T1", "T2", "T3", "T4", - } - }, - { "QuarterNames", - new String[] { + } + }, + { "QuarterNames", + new String[] { "1er trimestre", "2e trimestre", "3e trimestre", "4e trimestre", - } - }, - { "QuarterNarrows", - new String[] { - "T1", - "T2", - "T3", - "T4", - } - }, - { "calendarname.buddhist", - "Calendrier bouddhiste" }, - { "calendarname.gregorian", - "Calendrier gr\u00e9gorien" }, - { "calendarname.gregory", - "Calendrier gr\u00e9gorien" }, - { "calendarname.islamic", - "Calendrier musulman" }, - { "calendarname.islamic-civil", - "Calendrier civil musulman" }, - { "calendarname.islamicc", - "Calendrier civil musulman" }, - { "calendarname.japanese", - "Calendrier japonais" }, - { "calendarname.roc", - "Calendrier r\u00e9publicain chinois" }, - { "field.dayperiod", + } + }, + { "calendarname.buddhist", + "calendrier bouddhiste" }, + { "calendarname.gregorian", + "calendrier gr\u00e9gorien" }, + { "calendarname.gregory", + "calendrier gr\u00e9gorien" }, + { "calendarname.islamic", + "calendrier musulman" }, + { "calendarname.islamic-civil", + "calendrier musulman (tabulaire, \u00e9poque civile)" }, + { "calendarname.japanese", + "calendrier japonais" }, + { "calendarname.roc", + "calendrier r\u00e9publicain chinois" }, + { "field.dayperiod", "cadran" }, - { "field.era", + { "field.era", "\u00e8re" }, - { "field.hour", + { "field.hour", "heure" }, - { "field.minute", + { "field.minute", "minute" }, - { "field.month", + { "field.month", "mois" }, - { "field.second", + { "field.second", "seconde" }, - { "field.week", + { "field.week", "semaine" }, - { "field.weekday", + { "field.weekday", "jour de la semaine" }, - { "field.year", + { "field.year", "ann\u00e9e" }, - { "field.zone", + { "field.zone", "fuseau horaire" }, - { "islamic.DatePatterns", - new String[] { + { "islamic.DatePatterns", + new String[] { "EEEE d MMMM y GGGG", "d MMMM y GGGG", - "d MMM, y GGGG", - "d/M/y GGGG", - } - }, - { "islamic.Eras", - new String[] { + "d MMM y GGGG", + "dd/MM/y G", + } + }, + { "islamic.DayAbbreviations", + new String[] { + "dim.", + "lun.", + "mar.", + "mer.", + "jeu.", + "ven.", + "sam.", + } + }, + { "islamic.DayNames", + new String[] { + "dimanche", + "lundi", + "mardi", + "mercredi", + "jeudi", + "vendredi", + "samedi", + } + }, + { "islamic.DayNarrows", + new String[] { + "D", + "L", + "M", + "M", + "J", + "V", + "S", + } + }, + { "islamic.Eras", + new String[] { "", "AH", - } - }, - { "islamic.MonthAbbreviations", - new String[] { - "Mouh.", - "Saf.", - "Rabi\u02bb-oul-A.", - "Rabi\u02bb-out-T.", - "Djoum.-l-O.", - "Djoum.-t-T.", - "Radj.", - "Cha.", - "Ram.", - "Chaou.", - "Dou-l-Q.", - "Dou-l-H.", + } + }, + { "islamic.MonthAbbreviations", + new String[] { + "mouh.", + "saf.", + "rab. aw.", + "rab. th.", + "joum. oul.", + "joum. tha.", + "raj.", + "chaa.", + "ram.", + "chaw.", + "dhou. q.", + "dhou. h.", "", - } - }, - { "islamic.MonthNames", - new String[] { - "Mouharram", - "Safar", - "Rabi\u02bb-oul-Aououal", - "Rabi\u02bb-out-Tani", - "Djoumada-l-Oula", - "Djoumada-t-Tania", - "Radjab", - "Cha\u02bbban", - "Ramadan", - "Chaououal", - "Dou-l-Qa\u02bbda", - "Dou-l-Hidjja", + } + }, + { "islamic.MonthNames", + new String[] { + "mouharram", + "safar", + "rabia al awal", + "rabia ath-thani", + "joumada al oula", + "joumada ath-thania", + "rajab", + "chaabane", + "ramadan", + "chawwal", + "dhou al qi`da", + "dhou al-hijja", "", - } - }, - { "islamic.short.Eras", - new String[] { + } + }, + { "islamic.QuarterAbbreviations", + new String[] { + "T1", + "T2", + "T3", + "T4", + } + }, + { "islamic.QuarterNames", + new String[] { + "1er trimestre", + "2e trimestre", + "3e trimestre", + "4e trimestre", + } + }, + { "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[] { + } + }, + { "java.time.buddhist.DatePatterns", + new String[] { "EEEE d MMMM y G", "d MMMM y G", - "d MMM, y G", - "d/M/yyyy", - } - }, - { "java.time.buddhist.long.Eras", - new String[] { - "BC", - "\u00e8re bouddhiste", - } - }, - { "java.time.buddhist.short.Eras", - new String[] { - "BC", - "\u00e8re bouddhiste", - } - }, - { "java.time.islamic.DatePatterns", - new String[] { + "d MMM y G", + "dd/MM/y GGGGG", + } + }, + { "java.time.buddhist.long.Eras", + javatimebuddhistlongEras }, + { "java.time.buddhist.short.Eras", + javatimebuddhistlongEras }, + { "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 MMM y G", + "dd/MM/y GGGGG", + } + }, + { "java.time.japanese.DatePatterns", + new String[] { "EEEE d MMMM y G", "d MMMM y G", - "d MMM, y G", - "d/M/y GGGGG", - } - }, - { "java.time.long.Eras", - new String[] { + "d MMM y G", + "dd/MM/y GGGGG", + } + }, + { "java.time.long.Eras", + new String[] { "avant J\u00e9sus-Christ", "apr\u00e8s J\u00e9sus-Christ", - } - }, - { "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 GGGGG", - } - }, - { "java.time.short.Eras", - new String[] { + "d MMM y G", + "dd/MM/y GGGGG", + } + }, + { "java.time.short.Eras", + new String[] { "BC", "ap. J.-C.", - } - }, - { "roc.DatePatterns", - new String[] { + } + }, + { "roc.DatePatterns", + new String[] { "EEEE d MMMM y GGGG", "d MMMM y GGGG", - "d MMM, y GGGG", - "d/M/y G", - } - }, - { "roc.Eras", - new String[] { + "d MMM y GGGG", + "dd/MM/y G", + } + }, + { "roc.DayAbbreviations", + new String[] { + "dim.", + "lun.", + "mar.", + "mer.", + "jeu.", + "ven.", + "sam.", + } + }, + { "roc.DayNames", + new String[] { + "dimanche", + "lundi", + "mardi", + "mercredi", + "jeudi", + "vendredi", + "samedi", + } + }, + { "roc.DayNarrows", + new String[] { + "D", + "L", + "M", + "M", + "J", + "V", + "S", + } + }, + { "roc.Eras", + new String[] { + "avant RdC", + "RdC", + } + }, + { "roc.MonthAbbreviations", + new String[] { + "janv.", + "f\u00e9vr.", + "mars", + "avr.", + "mai", + "juin", + "juil.", + "ao\u00fbt", + "sept.", + "oct.", + "nov.", + "d\u00e9c.", + "", + } + }, + { "roc.MonthNames", + new String[] { + "janvier", + "f\u00e9vrier", + "mars", + "avril", + "mai", + "juin", + "juillet", + "ao\u00fbt", + "septembre", + "octobre", + "novembre", + "d\u00e9cembre", + "", + } + }, + { "roc.MonthNarrows", + new String[] { + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + "", + } + }, + { "roc.QuarterAbbreviations", + new String[] { + "T1", + "T2", + "T3", + "T4", + } + }, + { "roc.QuarterNames", + new String[] { + "1er trimestre", + "2e trimestre", + "3e trimestre", + "4e trimestre", + } + }, + { "roc.TimePatterns", + new String[] { + "HH:mm:ss zzzz", + "HH:mm:ss z", + "HH:mm:ss", + "HH:mm", + } + }, + { "roc.long.Eras", + new String[] { + "avant RdC", + "RdC", + } + }, + { "roc.narrow.Eras", + new String[] { "avant RdC", "RdC", - } - }, - { "roc.short.Eras", - new String[] { + } + }, + { "roc.short.Eras", + new String[] { "avant RdC", "RdC", - } - }, + } + }, }; } -} +}