OpenJDK / portola / portola
changeset 50588:374bd919d8fe
8202537: CLDR33
Summary: upgraded CLDR data to V33.
Reviewed-by: naoto
line wrap: on
line diff
--- a/make/gensrc/GensrcCLDR.gmk Fri Jun 15 10:48:56 2018 +0530 +++ b/make/gensrc/GensrcCLDR.gmk Fri Jun 15 11:58:34 2018 +0530 @@ -23,7 +23,7 @@ # questions. # -CLDRVERSION := 29.0.0 +CLDRVERSION := 33 CLDRSRCDIR := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
--- a/make/jdk/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java Fri Jun 15 10:48:56 2018 +0530 +++ b/make/jdk/src/classes/build/tools/cldrconverter/NumberingSystemsParseHandler.java Fri Jun 15 11:58:34 2018 +0530 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2018, 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 @@ -62,6 +62,9 @@ if (Character.isSurrogate(digits.charAt(0))) { // DecimalFormatSymbols doesn't support supplementary characters as digit zero. + // Replace supplementary digits with latin digits. This is a restriction till JDK-8204092 is resolved. + digits = "0123456789"; + put(script, digits); break numberingSystem; } // in case digits are in the reversed order, reverse back the order.
--- a/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java Fri Jun 15 10:48:56 2018 +0530 +++ b/src/java.base/share/classes/sun/util/cldr/CLDRTimeZoneNameProviderImpl.java Fri Jun 15 11:58:34 2018 +0530 @@ -178,13 +178,27 @@ // last resort String id = names[INDEX_TZID].toUpperCase(Locale.ROOT); - if (!id.startsWith("ETC/GMT") && - !id.startsWith("GMT") && - !id.startsWith("UT")) { + if (!id.startsWith("UT")) { names[index] = toGMTFormat(names[INDEX_TZID], index == INDEX_DST_LONG || index == INDEX_DST_SHORT, index % 2 != 0, locale); + // aliases of "GMT" timezone. + if ((exists(names, INDEX_STD_LONG)) && (id.startsWith("Etc/") + || id.startsWith("GMT") || id.startsWith("Greenwich"))) { + switch (id) { + case "Etc/GMT": + case "Etc/GMT-0": + case "Etc/GMT+0": + case "Etc/GMT0": + case "GMT+0": + case "GMT-0": + case "GMT0": + case "Greenwich": + names[INDEX_DST_LONG] = names[INDEX_GEN_LONG] = names[INDEX_STD_LONG]; + break; + } + } } }
--- a/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java Fri Jun 15 10:48:56 2018 +0530 +++ b/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java Fri Jun 15 11:58:34 2018 +0530 @@ -522,6 +522,9 @@ {"America/Porto_Acre", ACT}, {"America/Porto_Velho", AMT}, {"America/Puerto_Rico", AST}, + {"America/Punta_Arenas", new String[] {"Punta Arenas Standard Time", "GMT-03:00", + "Punta Arenas Standard Time", "GMT-03:00", + "Punta Arenas Time", "GMT-03:00"}}, {"America/Rainy_River", CST}, {"America/Rankin_Inlet", CST}, {"America/Recife", BRT}, @@ -630,6 +633,7 @@ {"Asia/Dushanbe", new String[] {"Tajikistan Time", "TJT", "Tajikistan Summer Time", "TJST", "Tajikistan Time", "TJT"}}, + {"Asia/Famagusta", EET}, {"Asia/Gaza", EET}, {"Asia/Harbin", CTT}, {"Asia/Hebron", EET}, @@ -801,6 +805,9 @@ {"Etc/Zulu", UTC}, {"Europe/Amsterdam", CET}, {"Europe/Andorra", CET}, + {"Europe/Astrakhan", new String[] {"Astrakhan Standard Time", "GMT+04:00", + "Astrakhan Standard Time", "GMT+04:00", + "Astrakhan Time", "GMT+04:00"}}, {"Europe/Athens", EET}, {"Europe/Belfast", GMTBST}, {"Europe/Belgrade", CET}, @@ -841,6 +848,9 @@ "Samara Time", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, + {"Europe/Saratov", new String[] {"Saratov Standard Time", "GMT+04:00", + "Saratov Standard Time", "GMT+04:00", + "Saratov Time", "GMT+04:00"}}, {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, @@ -848,6 +858,9 @@ {"Europe/Tallinn", EET}, {"Europe/Tirane", CET}, {"Europe/Tiraspol", EET}, + {"Europe/Ulyanovsk", new String[] {"Ulyanovsk Standard Time", "GMT+04:00", + "Ulyanovsk Standard Time", "GMT+04:00", + "Ulyanovsk Time", "GMT+04:00"}}, {"Europe/Uzhgorod", EET}, {"Europe/Vaduz", CET}, {"Europe/Vatican", CET},
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/bcp47/timezone.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldmlBCP47 SYSTEM "../../common/dtd/ldmlBCP47.dtd"> <!-- -Copyright © 1991-2013 Unicode, Inc. +Copyright © 1991-2017 Unicode, Inc. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) For terms of use, see http://www.unicode.org/copyright.html --> <ldmlBCP47> - <version number="$Revision: 12146 $"/> + <version number="$Revision: 13421 $"/> <keyword> <key name="tz" description="Time zone key" alias="timezone"> <type name="adalv" description="Andorra" alias="Europe/Andorra"/> @@ -131,6 +131,7 @@ <type name="ciabj" description="Abidjan, Côte d'Ivoire" alias="Africa/Abidjan"/> <type name="ckrar" description="Rarotonga, Cook Islands" alias="Pacific/Rarotonga"/> <type name="clipc" description="Easter Island, Chile" alias="Pacific/Easter Chile/EasterIsland"/> + <type name="clpuq" description="Punta Arenas, Chile" alias="America/Punta_Arenas" since="31"/> <type name="clscl" description="Santiago, Chile" alias="America/Santiago Chile/Continental"/> <type name="cmdla" description="Douala, Cameroon" alias="Africa/Douala"/> <type name="cnckg" description="Chongqing, China" deprecated="true" preferred="cnsha"/> @@ -144,6 +145,7 @@ <type name="cuhav" description="Havana, Cuba" alias="America/Havana Cuba"/> <type name="cvrai" description="Cape Verde" alias="Atlantic/Cape_Verde"/> <type name="cxxch" description="Christmas Island" alias="Indian/Christmas"/> + <type name="cyfmg" description="Famagusta, Cyprus" alias="Asia/Famagusta" since="31"/> <type name="cynic" description="Nicosia, Cyprus" alias="Asia/Nicosia Europe/Nicosia"/> <type name="czprg" description="Prague, Czech Republic" alias="Europe/Prague"/> <type name="deber" description="Berlin, Germany" alias="Europe/Berlin"/> @@ -187,6 +189,7 @@ <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/> <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/> <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/> + <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich"/> <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/> <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/> <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/> @@ -236,6 +239,7 @@ <type name="kzaau" description="Aqtau, Kazakhstan" alias="Asia/Aqtau"/> <type name="kzakx" description="Aqtobe, Kazakhstan" alias="Asia/Aqtobe"/> <type name="kzala" description="Almaty, Kazakhstan" alias="Asia/Almaty"/> + <type name="kzguw" description="Atyrau (Guryev), Kazakhstan" alias="Asia/Atyrau" since="31"/> <type name="kzkzo" description="Kyzylorda, Kazakhstan" alias="Asia/Qyzylorda"/> <type name="kzura" description="Oral, Kazakhstan" alias="Asia/Oral"/> <type name="lavte" description="Vientiane, Laos" alias="Asia/Vientiane"/> @@ -258,7 +262,7 @@ <type name="mhmaj" description="Majuro, Marshall Islands" alias="Pacific/Majuro"/> <type name="mkskp" description="Skopje, Macedonia" alias="Europe/Skopje"/> <type name="mlbko" description="Bamako, Mali" alias="Africa/Bamako Africa/Timbuktu"/> - <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon"/> + <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon"/> <type name="mncoq" description="Choibalsan, Mongolia" alias="Asia/Choibalsan"/> <type name="mnhvd" description="Khovd (Hovd), Mongolia" alias="Asia/Hovd"/> <type name="mnuln" description="Ulaanbaatar (Ulan Bator), Mongolia" alias="Asia/Ulaanbaatar Asia/Ulan_Bator"/> @@ -324,6 +328,8 @@ <type name="rereu" description="Réunion" alias="Indian/Reunion"/> <type name="robuh" description="Bucharest, Romania" alias="Europe/Bucharest"/> <type name="rsbeg" description="Belgrade, Serbia" alias="Europe/Belgrade"/> + <type name="ruasf" description="Astrakhan, Russia" alias="Europe/Astrakhan" since="30"/> + <type name="rubax" description="Barnaul, Russia" alias="Asia/Barnaul" since="30"/> <type name="ruchita" description="Chita Zabaykalsky, Russia" alias="Asia/Chita" since="26"/> <type name="rudyr" description="Anadyr, Russia" alias="Asia/Anadyr"/> <type name="rugdx" description="Magadan, Russia" alias="Asia/Magadan"/> @@ -332,12 +338,16 @@ <type name="rukhndg" description="Khandyga Tomponsky, Russia" alias="Asia/Khandyga" since="23"/> <type name="rukra" description="Krasnoyarsk, Russia" alias="Asia/Krasnoyarsk"/> <type name="rukuf" description="Samara, Russia" alias="Europe/Samara"/> + <type name="rukvx" description="Kirov, Russia" alias="Europe/Kirov" since="30"/> <type name="rumow" description="Moscow, Russia" alias="Europe/Moscow W-SU"/> <type name="runoz" description="Novokuznetsk, Russia" alias="Asia/Novokuznetsk"/> <type name="ruoms" description="Omsk, Russia" alias="Asia/Omsk"/> <type name="ruovb" description="Novosibirsk, Russia" alias="Asia/Novosibirsk"/> <type name="rupkc" description="Kamchatka Peninsula, Russia" alias="Asia/Kamchatka"/> + <type name="rurtw" description="Saratov, Russia" alias="Europe/Saratov" since="31"/> <type name="rusred" description="Srednekolymsk, Russia" alias="Asia/Srednekolymsk" since="26"/> + <type name="rutof" description="Tomsk, Russia" alias="Asia/Tomsk" since="30"/> + <type name="ruuly" description="Ulyanovsk, Russia" alias="Europe/Ulyanovsk" since="30"/> <type name="ruunera" description="Ust-Nera Oymyakonsky, Russia" alias="Asia/Ust-Nera" since="23"/> <type name="ruuus" description="Sakhalin, Russia" alias="Asia/Sakhalin"/> <type name="ruvog" description="Volgograd, Russia" alias="Europe/Volgograd"/> @@ -421,7 +431,7 @@ <type name="uswsq" description="Petersburg (Indiana), United States" alias="America/Indiana/Petersburg"/> <type name="usxul" description="Beulah (North Dakota), United States" alias="America/North_Dakota/Beulah" since="1.9.1"/> <type name="usyak" description="Yakutat (Alaska), United States" alias="America/Yakutat"/> - <type name="utc" description="UTC (Coordinated Universal Time)" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich Etc/UCT Etc/UTC Etc/Universal Etc/Zulu GMT GMT+0 GMT-0 GMT0 Greenwich UCT UTC Universal Zulu"/> + <type name="utc" description="UTC (Coordinated Universal Time)" alias="Etc/UTC Etc/UCT Etc/Universal Etc/Zulu UCT UTC Universal Zulu"/> <type name="utce01" description="1 hour ahead of UTC" alias="Etc/GMT-1"/> <type name="utce02" description="2 hours ahead of UTC" alias="Etc/GMT-2"/> <type name="utce03" description="3 hours ahead of UTC" alias="Etc/GMT-3"/>
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldml.dtd Fri Jun 15 11:58:34 2018 +0530 @@ -1,15 +1,15 @@ <!-- -Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 2003-2017 Unicode, Inc. and others. 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, 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. 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. -$Revision: 12436 $ +$Revision: 13905 $ --> -<!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, segmentations?, rbnf?, annotations?, metadata?, references?, special* ) ) ) > +<!ELEMENT ldml ( identity, ( alias | ( fallback*, localeDisplayNames?, layout?, contextTransforms?, characters?, delimiters?, measurement?, dates?, numbers?, units?, listPatterns?, collations?, posix?, characterLabels?, segmentations?, rbnf?, typographicNames?, annotations?, metadata?, references?, special* ) ) ) > <!ATTLIST ldml version CDATA #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> @@ -42,8 +42,8 @@ <!ELEMENT version EMPTY > <!ATTLIST version number CDATA #REQUIRED > <!--@METADATA--> -<!ATTLIST version cldrVersion CDATA #FIXED "29" > - <!--@METADATA--> +<!ATTLIST version cldrVersion CDATA #FIXED "33" > + <!--@VALUE--> <!ATTLIST version draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> @@ -264,19 +264,26 @@ <!--@METADATA--> <!ELEMENT transformNames ( alias | ( transformName | special )* ) > + <!--@DEPRECATED--> <!ATTLIST transformNames draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> <!ATTLIST transformNames references CDATA #IMPLIED > <!--@METADATA--> + <!--@DEPRECATED--> <!ELEMENT transformName ( #PCDATA ) > + <!--@DEPRECATED--> <!ATTLIST transformName type NMTOKEN #REQUIRED > + <!--@DEPRECATED--> <!ATTLIST transformName alt NMTOKENS #IMPLIED > + <!--@DEPRECATED--> <!ATTLIST transformName draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> + <!--@DEPRECATED--> <!ATTLIST transformName references CDATA #IMPLIED > <!--@METADATA--> + <!--@DEPRECATED--> <!-- # Either 1 alias OR any specials, any order, zero or more measurementSystemName --> @@ -408,13 +415,13 @@ <!-- ######################################################### --> -<!ELEMENT characters ( alias | ( exemplarCharacters*, ellipsis*, moreInformation*, stopwords*, indexLabels*, mapping*, special* ) ) > +<!ELEMENT characters ( alias | ( exemplarCharacters*, ellipsis*, moreInformation*, stopwords*, indexLabels*, mapping*, parseLenients*, special* ) ) > <!ATTLIST characters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> <!ELEMENT exemplarCharacters ( #PCDATA | cp )* > -<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index) #IMPLIED > +<!ATTLIST exemplarCharacters type (auxiliary | standard | punctuation | currencySymbol | index | numbers) #IMPLIED > <!--@DEPRECATED:currencySymbol--> <!ATTLIST exemplarCharacters alt NMTOKENS #IMPLIED > <!ATTLIST exemplarCharacters draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > @@ -567,6 +574,16 @@ <!--@VALUE--> <!--@DEPRECATED--> +<!ELEMENT parseLenients ( alias | ( parseLenient*, special* ) ) > +<!ATTLIST parseLenients scope (general | number | date) #REQUIRED > +<!ATTLIST parseLenients level (lenient | stricter) #REQUIRED > + +<!ELEMENT parseLenient ( #PCDATA ) > +<!ATTLIST parseLenient sample CDATA #REQUIRED > +<!ATTLIST parseLenient alt NMTOKENS #IMPLIED > +<!ATTLIST parseLenient draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + <!-- ######################################################### --> <!ELEMENT delimiters ( alias | ( quotationStart*, quotationEnd*, alternateQuotationStart*, alternateQuotationEnd*, special* ) ) > @@ -1411,6 +1428,7 @@ <!ELEMENT dateFormatItem ( #PCDATA ) > <!ATTLIST dateFormatItem id CDATA #REQUIRED > +<!ATTLIST dateFormatItem count (zero | one | two | few | many | other) #IMPLIED > <!ATTLIST dateFormatItem alt NMTOKENS #IMPLIED > <!ATTLIST dateFormatItem draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> @@ -1496,8 +1514,8 @@ <!--@VALUE--> <!--@DEPRECATED--> -<!ELEMENT field ( alias | ( displayName*, relative*, relativeTime*, special* ) ) > -<!ATTLIST field type (era | year | year-short | year-narrow | quarter | quarter-short | quarter-narrow | month | month-short | month-narrow | week | week-short | week-narrow | day | day-short | day-narrow | weekday | sun | sun-short | sun-narrow | mon | mon-short | mon-narrow | tue | tue-short | tue-narrow | wed | wed-short | wed-narrow | thu | thu-short | thu-narrow | fri | fri-short | fri-narrow | sat | sat-short | sat-narrow | dayperiod | hour | hour-short | hour-narrow | minute | minute-short | minute-narrow | second | second-short | second-narrow | zone) #IMPLIED > +<!ELEMENT field ( alias | ( displayName*, relative*, relativeTime*, relativePeriod*, special* ) ) > +<!ATTLIST field type (era | era-short | era-narrow | year | year-short | year-narrow | quarter | quarter-short | quarter-narrow | month | month-short | month-narrow | week | week-short | week-narrow | weekOfMonth | weekOfMonth-short | weekOfMonth-narrow | day | day-short | day-narrow | dayOfYear | dayOfYear-short | dayOfYear-narrow | weekday | weekday-short | weekday-narrow | weekdayOfMonth | weekdayOfMonth-short | weekdayOfMonth-narrow | sun | sun-short | sun-narrow | mon | mon-short | mon-narrow | tue | tue-short | tue-narrow | wed | wed-short | wed-narrow | thu | thu-short | thu-narrow | fri | fri-short | fri-narrow | sat | sat-short | sat-narrow | dayperiod | dayperiod-short | dayperiod-narrow | hour | hour-short | hour-narrow | minute | minute-short | minute-narrow | second | second-short | second-narrow | zone | zone-short | zone-narrow) #IMPLIED > <!ATTLIST field alt NMTOKENS #IMPLIED > <!ATTLIST field draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> @@ -1546,6 +1564,11 @@ <!--@VALUE--> <!--@DEPRECATED--> +<!ELEMENT relativePeriod ( #PCDATA ) > +<!ATTLIST relativePeriod alt NMTOKENS #IMPLIED > +<!ATTLIST relativePeriod draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + <!ELEMENT timeZoneNames ( alias | ( hourFormat*, hoursFormat*, gmtFormat*, gmtZeroFormat*, regionFormat*, fallbackFormat*, fallbackRegionFormat*, abbreviationFallback*, preferenceOrdering*, singleCountries*, default*, zone*, metazone*, special* ) ) > <!ATTLIST timeZoneNames draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> @@ -1770,7 +1793,7 @@ <!-- ######################################################### --> -<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, special* ) ) > +<!ELEMENT numbers ( alias | ( defaultNumberingSystem*, otherNumberingSystems*, minimumGroupingDigits*, symbols*, decimalFormats*, scientificFormats*, percentFormats*, currencyFormats*, currencies?, miscPatterns*, minimalPairs*, special* ) ) > <!ATTLIST numbers alt NMTOKENS #IMPLIED > <!ATTLIST numbers draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> @@ -1982,15 +2005,12 @@ <!--@DEPRECATED--> <!ELEMENT currencyGroup ( #PCDATA ) > - <!--@DEPRECATED--> <!ATTLIST currencyGroup alt NMTOKENS #IMPLIED > - <!--@DEPRECATED--> <!ATTLIST currencyGroup draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> - <!--@DEPRECATED--> + <!--@DEPRECATED:true, false--> <!ATTLIST currencyGroup references CDATA #IMPLIED > <!--@METADATA--> - <!--@DEPRECATED--> <!ATTLIST currencyGroup numberSystem CDATA #IMPLIED > <!--@DEPRECATED--> @@ -2238,6 +2258,24 @@ <!--@DEPRECATED--> <!ATTLIST miscPatterns numberSystem CDATA #IMPLIED > +<!ELEMENT minimalPairs ( alias | ( pluralMinimalPairs*, ordinalMinimalPairs*, special* ) ) > +<!ATTLIST minimalPairs alt NMTOKENS #IMPLIED > +<!ATTLIST minimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + <!--@DEPRECATED--> + +<!ELEMENT pluralMinimalPairs ( #PCDATA ) > +<!ATTLIST pluralMinimalPairs count NMTOKEN #IMPLIED > +<!ATTLIST pluralMinimalPairs alt NMTOKENS #IMPLIED > +<!ATTLIST pluralMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + +<!ELEMENT ordinalMinimalPairs ( #PCDATA ) > +<!ATTLIST ordinalMinimalPairs ordinal NMTOKEN #IMPLIED > +<!ATTLIST ordinalMinimalPairs alt NMTOKENS #IMPLIED > +<!ATTLIST ordinalMinimalPairs draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + <!-- ######################################################### --> <!ELEMENT units ( alias | ( unit*, unitLength*, durationUnit*, special* ) ) > @@ -2375,8 +2413,9 @@ <!ATTLIST collations version NMTOKEN #IMPLIED > <!--@METADATA--> <!ATTLIST collations draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > - <!--@METADATA--> <!-- should be DEPRECATED, but needs some cleanup first --> + <!--@METADATA--> + <!--@DEPRECATED--> <!ATTLIST collations validSubLocales CDATA #IMPLIED > <!--@VALUE--> <!--@DEPRECATED--> @@ -2388,9 +2427,9 @@ <!ELEMENT collation ( alias | ( base?, import*, settings?, suppress_contractions?, optimize?, ( cr* | rules? ), special* ) ) > <!ATTLIST collation type NMTOKEN "standard" > -<!ATTLIST collation visibility (internal | external) "external" > +<!ATTLIST collation visibility (internal | external) #IMPLIED > <!--@VALUE--> - <!--@DEPRECATED:internal--> + <!--@DEPRECATED--> <!ATTLIST collation alt NMTOKENS #IMPLIED > <!ATTLIST collation draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> @@ -2646,6 +2685,22 @@ <!--@METADATA--> <!--@DEPRECATED--> +<!ELEMENT characterLabels ( alias | ( characterLabelPattern*, characterLabel*, special* ) ) > + +<!ELEMENT characterLabelPattern ( #PCDATA ) > +<!ATTLIST characterLabelPattern type NMTOKEN #REQUIRED > +<!ATTLIST characterLabelPattern count (0 | 1 | zero | one | two | few | many | other) #IMPLIED > + <!-- count only used for certain patterns" --> +<!ATTLIST characterLabelPattern alt NMTOKENS #IMPLIED > +<!ATTLIST characterLabelPattern draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + +<!ELEMENT characterLabel ( #PCDATA ) > +<!ATTLIST characterLabel type NMTOKEN #REQUIRED > +<!ATTLIST characterLabel alt NMTOKENS #IMPLIED > +<!ATTLIST characterLabel draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + <!ELEMENT segmentations ( alias | ( segmentation*, special* ) ) > <!ATTLIST segmentations alt NMTOKENS #IMPLIED > <!ATTLIST segmentations draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > @@ -2747,12 +2802,35 @@ <!--@METADATA--> <!--@DEPRECATED:true, false--> +<!ELEMENT typographicNames ( alias | ( axisName*, styleName*, featureName*, special* ) ) > + +<!ELEMENT axisName ( #PCDATA ) > +<!ATTLIST axisName type (ital | opsz | slnt | wdth | wght) #REQUIRED > +<!ATTLIST axisName alt NMTOKENS #IMPLIED > +<!ATTLIST axisName draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + +<!ELEMENT styleName ( #PCDATA ) > +<!ATTLIST styleName type (ital | opsz | slnt | wdth | wght) #REQUIRED > +<!ATTLIST styleName subtype NMTOKEN #REQUIRED > +<!ATTLIST styleName alt NMTOKENS #IMPLIED > +<!ATTLIST styleName draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + +<!ELEMENT featureName ( #PCDATA ) > +<!ATTLIST featureName type (afrc | cpsp | dlig | frac | lnum | onum | ordn | pnum | smcp | tnum | zero) #REQUIRED > +<!ATTLIST featureName alt NMTOKENS #IMPLIED > +<!ATTLIST featureName draft (approved | contributed | provisional | unconfirmed) #IMPLIED > + <!--@METADATA--> + <!ELEMENT annotations ( alias | ( annotation*, special* ) ) > <!ELEMENT annotation ( #PCDATA ) > <!ATTLIST annotation cp CDATA #REQUIRED > <!ATTLIST annotation tts CDATA #IMPLIED > <!--@VALUE--> + <!--@DEPRECATED--> +<!ATTLIST annotation type (tts) #IMPLIED > <!ATTLIST annotation alt NMTOKENS #IMPLIED > <!ATTLIST annotation draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA-->
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlBCP47.dtd Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlBCP47.dtd Fri Jun 15 11:58:34 2018 +0530 @@ -1,12 +1,12 @@ <!-- -Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 2003-2017 Unicode, Inc. and others. 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, 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. 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. -$Revision: 12433 $ +$Revision: 13784 $ --> <!ELEMENT ldmlBCP47 ( version, generation?, cldrVersion?, keyword*, attribute* ) > @@ -15,7 +15,7 @@ <!--@METADATA--> <!ATTLIST version number CDATA #REQUIRED > <!--@METADATA--> -<!ATTLIST version cldrVersion CDATA #FIXED "29" > +<!ATTLIST version cldrVersion CDATA #FIXED "33" > <!--@VALUE--> <!ELEMENT generation EMPTY > @@ -39,7 +39,7 @@ <!ATTLIST key description CDATA #IMPLIED > <!--@VALUE--> <!ATTLIST key deprecated (true | false) "false" > - <!--@METADATA--> + <!--@VALUE--> <!ATTLIST key preferred NMTOKEN #IMPLIED > <!--@VALUE--> <!ATTLIST key alias NMTOKEN #IMPLIED > @@ -51,10 +51,10 @@ <!ELEMENT type EMPTY > <!ATTLIST type name NMTOKEN #REQUIRED > -<!ATTLIST type description CDATA #IMPLIED > +<!ATTLIST type description CDATA #REQUIRED > <!--@VALUE--> <!ATTLIST type deprecated (true | false) "false" > - <!--@METADATA--> + <!--@VALUE--> <!ATTLIST type preferred NMTOKEN #IMPLIED > <!--@VALUE--> <!ATTLIST type alias CDATA #IMPLIED > @@ -64,10 +64,10 @@ <!ELEMENT attribute EMPTY > <!ATTLIST attribute name NMTOKEN #REQUIRED > -<!ATTLIST attribute description CDATA #IMPLIED > +<!ATTLIST attribute description CDATA #REQUIRED > <!--@VALUE--> <!ATTLIST attribute deprecated (true | false) "false" > - <!--@METADATA--> + <!--@VALUE--> <!ATTLIST attribute preferred NMTOKEN #IMPLIED > <!--@VALUE--> <!ATTLIST attribute since CDATA #IMPLIED >
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/dtd/ldmlSupplemental.dtd Fri Jun 15 11:58:34 2018 +0530 @@ -1,5 +1,5 @@ <!-- -Copyright © 2003-2015 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html. +Copyright © 2003-2017 Unicode, Inc. and others. 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. @@ -7,18 +7,18 @@ 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. - $Revision: 12436 $ + $Revision: 13905 $ --> -<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope? ) > +<!ELEMENT supplementalData ( version, generation?, cldrVersion?, currencyData?, territoryContainment?, subdivisionContainment?, languageData?, territoryInfo?, postalCodeData?, calendarData?, calendarPreferenceData?, weekData?, timeData?, measurementData?, unitPreferenceData?, timezoneData?, characters?, transforms?, metadata?, codeMappings?, parentLocales?, likelySubtags?, metazoneInfo?, plurals?, telephoneCodeData?, numberingSystems?, bcp47KeywordMappings?, gender?, references?, languageMatching?, dayPeriodRuleSet*, metaZones?, primaryZones?, windowsZones?, coverageLevels?, idValidity?, rgScope?, languageGroups? ) > <!ELEMENT version EMPTY > <!--@METADATA--> <!ATTLIST version number CDATA #REQUIRED > <!--@METADATA--> -<!ATTLIST version cldrVersion CDATA #FIXED "29" > +<!ATTLIST version cldrVersion CDATA #FIXED "33" > <!--@VALUE--> -<!ATTLIST version unicodeVersion CDATA #FIXED "8.0.0" > +<!ATTLIST version unicodeVersion CDATA #FIXED "10.0.0" > <!--@VALUE--> <!ELEMENT generation EMPTY > @@ -114,6 +114,7 @@ <!ELEMENT subgroup EMPTY > <!ATTLIST subgroup type NMTOKEN #REQUIRED > <!ATTLIST subgroup subtype NMTOKEN #IMPLIED > + <!--@DEPRECATED--> <!ATTLIST subgroup contains NMTOKENS #IMPLIED > <!--@VALUE--> @@ -159,6 +160,8 @@ <!ELEMENT languagePopulation EMPTY > <!ATTLIST languagePopulation type NMTOKEN #REQUIRED > +<!ATTLIST languagePopulation literacyPercent NMTOKEN #IMPLIED > + <!--@VALUE--> <!ATTLIST languagePopulation writingPercent NMTOKEN #IMPLIED > <!--@VALUE--> <!ATTLIST languagePopulation populationPercent NMTOKEN #REQUIRED > @@ -200,6 +203,7 @@ <!ELEMENT calendarSystem EMPTY > <!ATTLIST calendarSystem type (solar | lunar | lunisolar | other) #REQUIRED > + <!--@VALUE--> <!ATTLIST calendarSystem references CDATA #IMPLIED > <!--@METADATA--> @@ -221,7 +225,7 @@ <!ATTLIST calendarPreference ordering NMTOKENS #REQUIRED > <!--@VALUE--> -<!ELEMENT weekData ( minDays*, firstDay*, weekendStart*, weekendEnd* ) > +<!ELEMENT weekData ( minDays*, firstDay*, weekendStart*, weekendEnd*, weekOfPreference* ) > <!ELEMENT minDays EMPTY > <!ATTLIST minDays count (1 | 2 | 3 | 4 | 5 | 6 | 7) #REQUIRED > @@ -267,6 +271,11 @@ <!--@METADATA--> <!ATTLIST weekendEnd alt NMTOKENS #IMPLIED > +<!ELEMENT weekOfPreference EMPTY > +<!ATTLIST weekOfPreference locales NMTOKENS #REQUIRED > +<!ATTLIST weekOfPreference ordering NMTOKENS #REQUIRED > + <!--@VALUE--> + <!ELEMENT timeData ( hours* ) > <!ELEMENT hours EMPTY > @@ -472,8 +481,8 @@ <!ELEMENT variable ( #PCDATA ) > <!--@ORDERED--> <!ATTLIST variable type NMTOKEN #IMPLIED > + <!--@VALUE--> <!ATTLIST variable id CDATA #REQUIRED > - <!--@VALUE--> <!ATTLIST variable draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED:true, false--> @@ -540,46 +549,61 @@ <!--@VALUE--> <!ELEMENT deprecated ( deprecatedItems* ) > + <!--@DEPRECATED--> <!ATTLIST deprecated draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> <!ELEMENT deprecatedItems EMPTY > + <!--@DEPRECATED--> <!ATTLIST deprecatedItems type (standard | supplemental | ldml | supplementalData | ldmlBCP47) #IMPLIED > - <!--@DEPRECATED:standard, supplemental--> + <!--@DEPRECATED--> <!ATTLIST deprecatedItems elements NMTOKENS #IMPLIED > + <!--@DEPRECATED--> <!ATTLIST deprecatedItems attributes NMTOKENS #IMPLIED > + <!--@DEPRECATED--> <!ATTLIST deprecatedItems values CDATA #IMPLIED > + <!--@DEPRECATED--> <!ATTLIST deprecatedItems draft (approved | contributed | provisional | unconfirmed | true | false) #IMPLIED > <!--@METADATA--> - <!--@DEPRECATED:true, false--> + <!--@DEPRECATED--> <!ELEMENT distinguishing ( distinguishingItems* ) > <!--@METADATA--> + <!--@DEPRECATED--> <!ATTLIST distinguishing draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> <!ELEMENT distinguishingItems EMPTY > + <!--@DEPRECATED--> <!ATTLIST distinguishingItems exclude (true | false) #IMPLIED > <!--@VALUE--> + <!--@DEPRECATED--> <!ATTLIST distinguishingItems elements NMTOKENS #IMPLIED > <!--@VALUE--> + <!--@DEPRECATED--> <!ATTLIST distinguishingItems attributes NMTOKENS #IMPLIED > + <!--@DEPRECATED--> <!ATTLIST distinguishingItems draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> + <!--@DEPRECATED--> <!ELEMENT blocking ( blockingItems* ) > <!--@METADATA--> + <!--@DEPRECATED--> <!ATTLIST blocking draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> <!--@DEPRECATED--> <!ELEMENT blockingItems EMPTY > + <!--@DEPRECATED--> <!ATTLIST blockingItems elements NMTOKENS #IMPLIED > <!--@VALUE--> + <!--@DEPRECATED--> <!ATTLIST blockingItems draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> + <!--@DEPRECATED--> <!ELEMENT coverageAdditions ( languageCoverage*, scriptCoverage*, territoryCoverage*, currencyCoverage*, timezoneCoverage* ) > <!--@DEPRECATED--> @@ -644,8 +668,10 @@ <!--@DEPRECATED--> <!ELEMENT skipDefaultLocale EMPTY > + <!--@DEPRECATED--> <!ATTLIST skipDefaultLocale services NMTOKENS #IMPLIED > <!--@VALUE--> + <!--@DEPRECATED--> <!ELEMENT defaultContent EMPTY > <!ATTLIST defaultContent locales NMTOKENS #IMPLIED > @@ -738,7 +764,7 @@ <!ATTLIST pluralRanges references CDATA #IMPLIED > <!--@METADATA--> -<!ELEMENT pluralRange ( #PCDATA ) > +<!ELEMENT pluralRange EMPTY > <!ATTLIST pluralRange start (zero | one | two | few | many | other) #IMPLIED > <!-- if missing, means *all* --> <!ATTLIST pluralRange end (zero | one | two | few | many | other) #IMPLIED > @@ -843,17 +869,28 @@ <!ELEMENT languageMatching ( languageMatches* ) > -<!ELEMENT languageMatches ( languageMatch* ) > +<!ELEMENT languageMatches ( paradigmLocales*, matchVariable*, languageMatch* ) > <!ATTLIST languageMatches type NMTOKEN #REQUIRED > +<!ELEMENT paradigmLocales EMPTY > +<!ATTLIST paradigmLocales locales NMTOKENS #REQUIRED > + <!--@VALUE--> + +<!ELEMENT matchVariable EMPTY > +<!ATTLIST matchVariable id CDATA #REQUIRED > +<!ATTLIST matchVariable value CDATA #REQUIRED > + <!--@VALUE--> + <!ELEMENT languageMatch EMPTY > <!--@ORDERED--> <!ATTLIST languageMatch desired CDATA #REQUIRED > +<!ATTLIST languageMatch supported CDATA #REQUIRED > +<!ATTLIST languageMatch percent NMTOKEN #IMPLIED > + <!--@VALUE--> +<!ATTLIST languageMatch distance NMTOKEN #IMPLIED > + <!--@VALUE--> <!ATTLIST languageMatch oneway (true | false) #IMPLIED > <!--@VALUE--> -<!ATTLIST languageMatch percent NMTOKEN #REQUIRED > - <!--@VALUE--> -<!ATTLIST languageMatch supported CDATA #REQUIRED > <!-- # Day Periods --> @@ -943,3 +980,8 @@ <!ATTLIST rgPath path CDATA #REQUIRED > <!ATTLIST rgPath draft (approved | contributed | provisional | unconfirmed) #IMPLIED > <!--@METADATA--> + +<!ELEMENT languageGroups ( languageGroup* ) > + +<!ELEMENT languageGroup ( #PCDATA ) > +<!ATTLIST languageGroup parent NMTOKEN #REQUIRED >
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html + +Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations. --> <ldml> <identity> - <version number="$Revision: 12293 $"/> + <version number="$Revision: 13911 $"/> <language type="af"/> </identity> <localeDisplayNames> @@ -16,135 +19,209 @@ <localeKeyTypePattern>{0}: {1}</localeKeyTypePattern> </localeDisplayPattern> <languages> + <language type="aa">Afar</language> <language type="ab">Abkasies</language> + <language type="ace">Atsjenees</language> <language type="ach">Akoli</language> + <language type="ada">Adangme</language> + <language type="ady">Adyghe</language> <language type="af">Afrikaans</language> <language type="agq">Aghem</language> + <language type="ain">Ainu</language> <language type="ak">Akan</language> + <language type="ale">Aleut</language> + <language type="alt">Suid-Altai</language> <language type="am">Amharies</language> + <language type="an">Aragonees</language> + <language type="anp">Angika</language> <language type="ar">Arabies</language> - <language type="ar_001">Moderne Standaard Arabies</language> + <language type="ar_001">Moderne Standaardarabies</language> <language type="arc">Aramees</language> <language type="arn">Mapuche</language> + <language type="arp">Arapaho</language> <language type="as">Assamees</language> <language type="asa">Asu</language> + <language type="ast">Asturies</language> + <language type="av">Avaries</language> + <language type="awa">Awadhi</language> <language type="ay">Aymara</language> <language type="az">Azerbeidjans</language> <language type="az" alt="short">Azeri</language> <language type="ba">Baskir</language> - <language type="be">Belo-Russies</language> + <language type="ban">Balinees</language> + <language type="bas">Basaa</language> + <language type="be">Belarussies</language> <language type="bem">Bemba</language> <language type="bez">Bena</language> <language type="bg">Bulgaars</language> <language type="bgn">Wes-Balochi</language> + <language type="bho">Bhojpuri</language> + <language type="bi">Bislama</language> + <language type="bin">Bini</language> + <language type="bla">Siksika</language> <language type="bm">Bambara</language> <language type="bn">Bengaals</language> <language type="bo">Tibettaans</language> <language type="br">Bretons</language> <language type="brx">Bodo</language> <language type="bs">Bosnies</language> + <language type="bug">Buginees</language> + <language type="byn">Blin</language> <language type="ca">Katalaans</language> - <language type="ce">Tsjetsjen</language> - <language type="cgg">Sjiga</language> + <language type="ce">Tsjetsjeens</language> + <language type="ceb">Cebuano</language> + <language type="cgg">Kiga</language> + <language type="ch">Chamorro</language> + <language type="chk">Chuukees</language> + <language type="chm">Mari</language> + <language type="cho">Choctaw</language> <language type="chr">Cherokees</language> - <language type="ckb">Sorani Koerdies</language> + <language type="chy">Cheyennees</language> + <language type="ckb">Sorani</language> <language type="co">Korsikaans</language> - <language type="cop" draft="unconfirmed">Kopties</language> + <language type="cop">Kopties</language> + <language type="crs">Seselwa Franskreools</language> <language type="cs">Tsjeggies</language> - <language type="cu" draft="unconfirmed">Kerkslawies</language> + <language type="cu">Kerkslawies</language> <language type="cv">Chuvash</language> <language type="cy">Wallies</language> <language type="da">Deens</language> + <language type="dak">Dakotaans</language> + <language type="dar">Dakota</language> <language type="dav">Taita</language> <language type="de">Duits</language> <language type="de_CH">Switserse hoog-Duits</language> + <language type="dgr">Dogrib</language> <language type="dje">Zarma</language> <language type="dsb">Lae Sorbies</language> <language type="dua">Duala</language> <language type="dv">Divehi</language> <language type="dyo">Jola-Fonyi</language> <language type="dz">Dzongkha</language> + <language type="dzg">Dazaga</language> <language type="ebu">Embu</language> <language type="ee">Ewe</language> <language type="efi">Efik</language> - <language type="egy" draft="contributed">Antieke Egipties</language> + <language type="egy">Antieke Egipties</language> + <language type="eka">Ekajuk</language> <language type="el">Grieks</language> <language type="en">Engels</language> + <language type="en_GB">Engels (VK)</language> <language type="en_GB" alt="short">Engels (VK)</language> + <language type="en_US">Engels (VSA)</language> <language type="en_US" alt="short">Engels (VSA)</language> <language type="eo">Esperanto</language> <language type="es">Spaans</language> <language type="et">Estnies</language> <language type="eu">Baskies</language> + <language type="ewo">Ewondo</language> <language type="fa">Persies</language> + <language type="ff">Fulah</language> <language type="fi">Fins</language> <language type="fil">Filippyns</language> <language type="fj">Fidjiaans</language> - <language type="fo">Faroees</language> + <language type="fo">Faroëes</language> + <language type="fon">Fon</language> <language type="fr">Frans</language> - <language type="fy">Wes-Fries</language> + <language type="fur">Friuliaans</language> + <language type="fy">Fries</language> <language type="ga">Iers</language> <language type="gaa">Gaa</language> <language type="gag">Gagauz</language> + <language type="gan">Gan-Sjinees</language> <language type="gd">Skotse Gallies</language> + <language type="gez">Geez</language> + <language type="gil">Gilbertees</language> <language type="gl">Galisies</language> <language type="gn">Guarani</language> + <language type="gor">Gorontalo</language> <language type="got">Goties</language> - <language type="grc" draft="contributed">Antieke Grieks</language> + <language type="grc">Antieke Grieks</language> <language type="gsw">Switserse Duits</language> <language type="gu">Goedjarati</language> <language type="guz">Gusii</language> <language type="gv">Manx</language> + <language type="gwi">Gwichʼin</language> <language type="ha">Hausa</language> + <language type="hak">Hakka-Sjinees</language> <language type="haw">Hawaiies</language> <language type="he">Hebreeus</language> <language type="hi">Hindi</language> - <language type="hit" draft="unconfirmed">Hetities</language> + <language type="hil">Hiligaynon</language> + <language type="hit">Hetities</language> + <language type="hmn">Hmong</language> <language type="hr">Kroaties</language> - <language type="hsb">Hoog-Sorbies</language> + <language type="hsb">Oppersorbies</language> + <language type="hsn">Xiang-Sjinees</language> <language type="ht">Haïtiaans</language> <language type="hu">Hongaars</language> + <language type="hup">Hupa</language> <language type="hy">Armeens</language> + <language type="hz">Herero</language> <language type="ia">Interlingua</language> + <language type="iba">Ibanees</language> + <language type="ibb">Ibibio</language> <language type="id">Indonesies</language> - <language type="ie" draft="provisional">Interlingue</language> + <language type="ie">Interlingue</language> <language type="ig">Igbo</language> <language type="ii">Sichuan Yi</language> + <language type="ilo">Iloko</language> + <language type="inh">Ingush</language> + <language type="io">Ido</language> <language type="is">Yslands</language> <language type="it">Italiaans</language> - <language type="iu">Innuïties</language> + <language type="iu">Inuïties</language> <language type="ja">Japannees</language> + <language type="jbo">Lojban</language> <language type="jgo">Ngomba</language> <language type="jmc">Machame</language> <language type="jv">Javaans</language> <language type="ka">Georgies</language> <language type="kab">Kabyle</language> + <language type="kac">Kachin</language> + <language type="kaj">Jju</language> <language type="kam">Kamba</language> + <language type="kbd">Kabardiaans</language> + <language type="kcg">Tyap</language> <language type="kde">Makonde</language> <language type="kea">Kabuverdianu</language> + <language type="kfo">Koro</language> <language type="kg">Kongolees</language> + <language type="kha">Khasi</language> <language type="khq">Koyra Chiini</language> <language type="ki">Kikuyu</language> + <language type="kj">Kuanyama</language> <language type="kk">Kazaks</language> + <language type="kkj">Kako</language> <language type="kl">Kalaallisut</language> <language type="kln">Kalenjin</language> <language type="km">Khmer</language> + <language type="kmb">Kimbundu</language> <language type="kn">Kannada</language> <language type="ko">Koreaans</language> <language type="koi">Komi-Permyaks</language> <language type="kok">Konkani</language> - <language type="kru" draft="unconfirmed">Kurukh</language> + <language type="kpe">Kpellees</language> + <language type="kr">Kanuri</language> + <language type="krc">Karachay-Balkar</language> + <language type="krl">Karelies</language> + <language type="kru">Kurukh</language> <language type="ks">Kasjmirs</language> <language type="ksb">Shambala</language> <language type="ksf">Bafia</language> + <language type="ksh">Keuls</language> <language type="ku">Koerdies</language> + <language type="kum">Kumyk</language> + <language type="kv">Komi</language> <language type="kw">Kornies</language> <language type="ky">Kirgisies</language> <language type="la">Latyn</language> + <language type="lad">Ladino</language> <language type="lag">Langi</language> <language type="lb">Luxemburgs</language> + <language type="lez">Lezghies</language> <language type="lg">Ganda</language> - <language type="li" draft="unconfirmed">Limburgs</language> + <language type="li">Limburgs</language> <language type="lkt">Lakota</language> <language type="ln">Lingaals</language> <language type="lo">Lao</language> @@ -153,42 +230,68 @@ <language type="lt">Litaus</language> <language type="lu">Luba-Katanga</language> <language type="lua">Luba-Lulua</language> + <language type="lun">Lunda</language> <language type="luo">Luo</language> + <language type="lus">Mizo</language> <language type="luy">Luyia</language> <language type="lv">Letties</language> + <language type="mad">Madurees</language> + <language type="mag">Magahi</language> + <language type="mai">Maithili</language> + <language type="mak">Makasar</language> <language type="mas">Masai</language> + <language type="mdf">Moksha</language> + <language type="men">Mende</language> <language type="mer">Meru</language> <language type="mfe">Morisjen</language> <language type="mg">Malgassies</language> <language type="mgh">Makhuwa-Meetto</language> <language type="mgo">Meta’</language> + <language type="mh">Marshallees</language> <language type="mi">Maori</language> + <language type="mic">Micmac</language> + <language type="min">Minangkabaus</language> <language type="mk">Masedonies</language> <language type="ml">Malabaars</language> <language type="mn">Mongools</language> + <language type="mni">Manipuri</language> <language type="moh">Mohawk</language> + <language type="mos">Mossi</language> <language type="mr">Marathi</language> <language type="ms">Maleis</language> <language type="mt">Maltees</language> <language type="mua">Mundang</language> <language type="mul">Veelvuldige tale</language> + <language type="mus">Kreek</language> + <language type="mwl">Mirandees</language> <language type="my">Birmaans</language> + <language type="myv">Erzya</language> <language type="mzn">Masanderani</language> + <language type="na">Nauru</language> + <language type="nan">Min Nan-Sjinees</language> + <language type="nap">Neapolitaans</language> <language type="naq">Nama</language> <language type="nb">Noorse Bokmål</language> <language type="nd">Noord-Ndebele</language> <language type="nds">Lae Duits</language> <language type="nds_NL">Nedersaksies</language> <language type="ne">Nepalees</language> + <language type="new">Newari</language> + <language type="ng">Ndonga</language> + <language type="nia">Nias</language> + <language type="niu">Niueaans</language> <language type="nl">Nederlands</language> <language type="nl_BE">Vlaams</language> <language type="nmg">Kwasio</language> <language type="nn">Noorweegse Nynorsk</language> - <language type="no" draft="unconfirmed">Noors</language> + <language type="nnh">Ngiemboon</language> + <language type="no">Noors</language> + <language type="nog">Nogai</language> <language type="nqo">N’Ko</language> <language type="nr">Suid-Ndebele</language> <language type="nso">Noord-Sotho</language> <language type="nus">Nuer</language> + <language type="nv">Navajo</language> <language type="ny">Nyanja</language> <language type="nyn">Nyankole</language> <language type="oc">Oksitaans</language> @@ -196,33 +299,50 @@ <language type="or">Oriya</language> <language type="os">Osseties</language> <language type="pa">Pandjabi</language> - <language type="phn" draft="unconfirmed">Fenisies</language> + <language type="pag">Pangasinan</language> + <language type="pam">Pampanga</language> + <language type="pap">Papiamento</language> + <language type="pau">Palauaans</language> + <language type="pcm">Nigeriese Pidgin</language> + <language type="phn">Fenisies</language> <language type="pl">Pools</language> + <language type="prg">Pruisies</language> <language type="ps">Pasjto</language> <language type="ps" alt="variant">Pushto</language> <language type="pt">Portugees</language> <language type="qu">Quechua</language> <language type="quc">K’iche’</language> + <language type="rap">Rapanui</language> + <language type="rar">Rarotongaans</language> <language type="rm">Reto-Romaans</language> <language type="rn">Rundi</language> <language type="ro">Roemeens</language> <language type="ro_MD">Moldawies</language> <language type="rof">Rombo</language> + <language type="root">Root</language> <language type="ru">Russies</language> + <language type="rup">Aromanies</language> <language type="rw">Rwandees</language> <language type="rwk">Rwa</language> <language type="sa">Sanskrit</language> + <language type="sad">Sandawees</language> + <language type="sah">Sakhaans</language> <language type="saq">Samburu</language> + <language type="sat">Santalies</language> + <language type="sba">Ngambay</language> <language type="sbp">Sangu</language> - <language type="sco" draft="unconfirmed">Skots</language> + <language type="sc">Sardinies</language> + <language type="scn">Sisiliaans</language> + <language type="sco">Skots</language> <language type="sd">Sindhi</language> <language type="sdh">Suid-Koerdies</language> <language type="se">Noord-Sami</language> <language type="seh">Sena</language> <language type="ses">Koyraboro Senni</language> <language type="sg">Sango</language> - <language type="sh" draft="unconfirmed">Serwo-Kroaties</language> + <language type="sh">Serwo-Kroaties</language> <language type="shi">Tachelhit</language> + <language type="shn">Shan</language> <language type="si">Sinhala</language> <language type="sk">Slowaaks</language> <language type="sl">Sloweens</language> @@ -232,56 +352,81 @@ <language type="smn">Inari Sami</language> <language type="sms">Skolt Sami</language> <language type="sn">Shona</language> + <language type="snk">Soninke</language> <language type="so">Somalies</language> <language type="sq">Albanees</language> <language type="sr">Serwies</language> + <language type="srn">Sranan Tongo</language> <language type="ss">Swazi</language> + <language type="ssy">Saho</language> <language type="st">Suid-Sotho</language> <language type="su">Sundanees</language> + <language type="suk">Sukuma</language> <language type="sv">Sweeds</language> <language type="sw">Swahili</language> <language type="sw_CD">Swahili (Kongo)</language> - <language type="swb" draft="unconfirmed">Shimaorees</language> + <language type="swb">Comoraans</language> + <language type="syr">Siries</language> <language type="ta">Tamil</language> <language type="te">Teloegoe</language> + <language type="tem">Timne</language> <language type="teo">Teso</language> - <language type="tet">Tetum</language> + <language type="tet">Tetoem</language> <language type="tg">Tadzjieks</language> <language type="th">Thai</language> <language type="ti">Tigrinya</language> + <language type="tig">Tigre</language> <language type="tk">Turkmeens</language> <language type="tlh">Klingon</language> <language type="tn">Tswana</language> <language type="to">Tongaans</language> <language type="tpi">Tok Pisin</language> <language type="tr">Turks</language> + <language type="trv">Taroko</language> <language type="ts">Tsonga</language> <language type="tt">Tataars</language> <language type="tum">Toemboeka</language> - <language type="tw" draft="unconfirmed">Twi</language> + <language type="tvl">Tuvalu</language> + <language type="tw">Twi</language> <language type="twq">Tasawaq</language> <language type="ty">Tahities</language> - <language type="tzm">Sentraal Atlas Tamazight</language> + <language type="tyv">Tuvinees</language> + <language type="tzm">Sentraal-Atlas-Tamazight</language> + <language type="udm">Udmurt</language> <language type="ug">Uighur</language> <language type="uk">Oekraïens</language> + <language type="umb">Umbundu</language> <language type="und">Onbekende of ongeldige taal</language> <language type="ur">Oerdoe</language> <language type="uz">Oezbeeks</language> <language type="vai">Vai</language> <language type="ve">Venda</language> <language type="vi">Viëtnamees</language> + <language type="vo">Volapük</language> <language type="vun">Vunjo</language> + <language type="wa">Walloon</language> + <language type="wae">Walser</language> + <language type="wal">Wolaytta</language> + <language type="war">Waray</language> <language type="wbp">Warlpiri</language> <language type="wo">Wolof</language> + <language type="wuu">Wu-Sjinees</language> + <language type="xal">Kalmyk</language> <language type="xh">Xhosa</language> <language type="xog">Soga</language> + <language type="yav">Yangben</language> + <language type="ybb">Yemba</language> <language type="yi">Jiddisj</language> <language type="yo">Yoruba</language> - <language type="yue" draft="unconfirmed">Kantonees</language> + <language type="yue">Kantonees</language> <language type="zgh">Standaard Marokkaanse Tamazight</language> <language type="zh">Sjinees</language> + <language type="zh_Hans">Chinees (Vereenvoudig)</language> + <language type="zh_Hant">Chinees (Tradisioneel)</language> <language type="zu">Zoeloe</language> - <language type="zxx">Geen linguistiese inhoud</language> + <language type="zun">Zuni</language> + <language type="zxx">Geen taalinhoud nie</language> + <language type="zza">Zaza</language> </languages> <scripts> <script type="Arab">Arabies</script> @@ -301,6 +446,7 @@ <script type="Grek">Grieks</script> <script type="Gujr">Gudjarati</script> <script type="Guru">Gurmukhi</script> + <script type="Hanb">Hanb</script> <script type="Hang">Hangul</script> <script type="Hani">Han</script> <script type="Hans">Vereenvoudig</script> @@ -309,6 +455,8 @@ <script type="Hant" alt="stand-alone">Tradisionele Han</script> <script type="Hebr">Hebreeus</script> <script type="Hira">Hiragana</script> + <script type="Hrkt">Japannese lettergreepskrif</script> + <script type="Jamo">Jamo</script> <script type="Jpan">Japannees</script> <script type="Kana">Katakana</script> <script type="Khmr">Khmer</script> @@ -329,6 +477,8 @@ <script type="Tibt">Tibettaans</script> <script type="Ugar" draft="unconfirmed">Ugaritieses</script> <script type="Visp" draft="unconfirmed">Visible Speech-karakters</script> + <script type="Zmth">Wiskundige notasie</script> + <script type="Zsye">Emoji</script> <script type="Zsym">Simbole</script> <script type="Zxxx">Ongeskrewe</script> <script type="Zyyy">Algemeen</script> @@ -364,6 +514,7 @@ <territory type="151">Oos-Europa</territory> <territory type="154">Noord-Europa</territory> <territory type="155">Wes-Europa</territory> + <territory type="202">Afrika suid van die Sahara</territory> <territory type="419">Latyns-Amerika</territory> <territory type="AC">Ascensioneiland</territory> <territory type="AD">Andorra</territory> @@ -376,7 +527,7 @@ <territory type="AO">Angola</territory> <territory type="AQ">Antarktika</territory> <territory type="AR">Argentinië</territory> - <territory type="AS">Amerikaans-Samoa</territory> + <territory type="AS">Amerikaanse Samoa</territory> <territory type="AT">Oostenryk</territory> <territory type="AU">Australië</territory> <territory type="AW">Aruba</territory> @@ -404,7 +555,7 @@ <territory type="BY">Belarus</territory> <territory type="BZ">Belize</territory> <territory type="CA">Kanada</territory> - <territory type="CC">Kokos-eilande</territory> + <territory type="CC">Kokoseilande</territory> <territory type="CD">Demokratiese Republiek van die Kongo</territory> <territory type="CD" alt="variant">Kongo (DRK)</territory> <territory type="CF">Sentraal-Afrikaanse Republiek</territory> @@ -424,7 +575,8 @@ <territory type="CW">Curaçao</territory> <territory type="CX">Kerseiland</territory> <territory type="CY">Siprus</territory> - <territory type="CZ">Tjeggiese Republiek</territory> + <territory type="CZ">Tsjeggië</territory> + <territory type="CZ" alt="variant">Tsjeggiese Republiek</territory> <territory type="DE">Duitsland</territory> <territory type="DG">Diego Garcia</territory> <territory type="DJ">Djiboeti</territory> @@ -441,6 +593,7 @@ <territory type="ES">Spanje</territory> <territory type="ET">Ethiopië</territory> <territory type="EU">Europese Unie</territory> + <territory type="EZ">Eurosone</territory> <territory type="FI">Finland</territory> <territory type="FJ">Fidji</territory> <territory type="FK">Falklandeilande</territory> @@ -470,7 +623,7 @@ <territory type="GY">Guyana</territory> <territory type="HK">Hongkong SAS Sjina</territory> <territory type="HK" alt="short">Hongkong</territory> - <territory type="HM">Heard- en McDonaldeilande</territory> + <territory type="HM">Heardeiland en McDonaldeilande</territory> <territory type="HN">Honduras</territory> <territory type="HR">Kroasië</territory> <territory type="HT">Haïti</territory> @@ -491,11 +644,11 @@ <territory type="JO">Jordanië</territory> <territory type="JP">Japan</territory> <territory type="KE">Kenia</territory> - <territory type="KG">Kirgisië</territory> + <territory type="KG">Kirgistan</territory> <territory type="KH">Kambodja</territory> <territory type="KI">Kiribati</territory> <territory type="KM">Comore</territory> - <territory type="KN">St. Kitts en Nevis</territory> + <territory type="KN">Sint Kitts en Nevis</territory> <territory type="KP">Noord-Korea</territory> <territory type="KR">Suid-Korea</territory> <territory type="KW">Koeweit</territory> @@ -503,7 +656,7 @@ <territory type="KZ">Kazakstan</territory> <territory type="LA">Laos</territory> <territory type="LB">Libanon</territory> - <territory type="LC">St. Lucia</territory> + <territory type="LC">Sint Lucia</territory> <territory type="LI">Liechtenstein</territory> <territory type="LK">Sri Lanka</territory> <territory type="LR">Liberië</territory> @@ -516,7 +669,7 @@ <territory type="MC">Monaco</territory> <territory type="MD">Moldowa</territory> <territory type="ME">Montenegro</territory> - <territory type="MF">St. Martin</territory> + <territory type="MF">Sint Martin</territory> <territory type="MG">Madagaskar</territory> <territory type="MH">Marshalleilande</territory> <territory type="MK">Macedonië</territory> @@ -557,7 +710,7 @@ <territory type="PH">Filippyne</territory> <territory type="PK">Pakistan</territory> <territory type="PL">Pole</territory> - <territory type="PM">St. Pierre en Miquelon</territory> + <territory type="PM">Sint Pierre en Miquelon</territory> <territory type="PN">Pitcairneilande</territory> <territory type="PR">Puerto Rico</territory> <territory type="PS">Palestynse gebiede</territory> @@ -602,7 +755,7 @@ <territory type="TJ">Tadjikistan</territory> <territory type="TK">Tokelau</territory> <territory type="TL">Oos-Timor</territory> - <territory type="TM">Turkmenië</territory> + <territory type="TM">Turkmenistan</territory> <territory type="TN">Tunisië</territory> <territory type="TO">Tonga</territory> <territory type="TR">Turkye</territory> @@ -612,16 +765,18 @@ <territory type="TZ">Tanzanië</territory> <territory type="UA">Oekraïne</territory> <territory type="UG">Uganda</territory> - <territory type="UM">VS klein omliggende eilande</territory> + <territory type="UM">Klein afgeleë eilande van die VSA</territory> + <territory type="UN">Verenigde Nasies</territory> + <territory type="UN" alt="short">VN</territory> <territory type="US">Verenigde State van Amerika</territory> <territory type="US" alt="short">VSA</territory> <territory type="UY">Uruguay</territory> <territory type="UZ">Oesbekistan</territory> <territory type="VA">Vatikaanstad</territory> - <territory type="VC">St. Vincent en die Grenadine</territory> + <territory type="VC">Sint Vincent en die Grenadine</territory> <territory type="VE">Venezuela</territory> <territory type="VG">Britse Maagde-eilande</territory> - <territory type="VI">Amerikaanse Maagde-eilande</territory> + <territory type="VI">VSA se Maagde-eilande</territory> <territory type="VN">Viëtnam</territory> <territory type="VU">Vanuatu</territory> <territory type="WF">Wallis en Futuna</territory> @@ -643,11 +798,11 @@ </variants> <keys> <key type="calendar">Kalender</key> + <key type="cf">Geldeenheidformaat</key> <key type="colAlternate">Ignoreer simboolsortering</key> <key type="colBackwards">Omgekeerde aksentsortering</key> <key type="colCaseFirst">Hoofletters/kleinletters-sortering</key> <key type="colCaseLevel">Kassensitiewe sortering</key> - <key type="colHiraganaQuaternary">Kana-sortering</key> <key type="collation">Sorteervolgorde</key> <key type="colNormalization">Genormaliseerde sortering</key> <key type="colNumeric">Numeriese sortering</key> @@ -659,7 +814,6 @@ <key type="numbers">Syfers</key> <key type="timezone">Tydsone</key> <key type="va">Lokaalvariant</key> - <key type="variableTop">Sorteer as simbole</key> <key type="x">Privaat gebruik</key> </keys> <types> @@ -678,6 +832,8 @@ <type key="calendar" type="japanese">Japannese kalender</type> <type key="calendar" type="persian">Persiese kalender</type> <type key="calendar" type="roc">Minguo-kalender</type> + <type key="cf" type="account">Rekeningkundige geldeenheidformaat</type> + <type key="cf" type="standard">Standaard Geldeenheidformaat</type> <type key="colAlternate" type="non-ignorable">Sorteer simbole</type> <type key="colAlternate" type="shifted">Sorteer ignoreersimbole</type> <type key="colBackwards" type="no">Sorteer aksente gewoonweg</type> @@ -687,8 +843,6 @@ <type key="colCaseFirst" type="upper">Sorteer hoofletters eerste</type> <type key="colCaseLevel" type="no">Sorteer nie kassensitief nie</type> <type key="colCaseLevel" type="yes">Sorteer kassensitief</type> - <type key="colHiraganaQuaternary" type="no">Sorteer Kana afsonderlik</type> - <type key="colHiraganaQuaternary" type="yes">Sorteer Kana anders</type> <type key="collation" type="big5han">Tradisionele Chinese sorteervolgorde - Groot5</type> <type key="collation" type="dictionary">Woordeboek-sorteervolgorde</type> <type key="collation" type="ducet">Verstek Unicode-sorteervolgorde</type> @@ -712,14 +866,19 @@ <type key="colStrength" type="quaternary">Sorteer aksente/kas/breedte/Kana</type> <type key="colStrength" type="secondary">Sorteer aksente</type> <type key="colStrength" type="tertiary">Sorteer aksente/kas/breedte</type> + <type key="d0" type="fwidth">Vollewydte</type> + <type key="d0" type="hwidth">halfwydte</type> + <type key="d0" type="npinyin">Numeries</type> <type key="hc" type="h11">12-uur-stelsel (0-11)</type> - <type key="hc" type="h12">112-uur-stelsel (1-12)</type> - <type key="hc" type="h23">24-uur-stelsel</type> + <type key="hc" type="h12">12-uur-stelsel (1-12)</type> + <type key="hc" type="h23">24-uur-stelsel (0-23)</type> <type key="hc" type="h24">24-uur-stelsel (1-24)</type> <type key="lb" type="loose">Los reëlbreek-styl</type> <type key="lb" type="normal">Normale reëlbreek-styl</type> <type key="lb" type="strict">Streng reëlbreek-styl</type> - <type key="ms" type="metric">Metriese stelsel</type> + <type key="m0" type="bgn">BGN</type> + <type key="m0" type="ungegn">UNGEGN</type> + <type key="ms" type="metric">Metrieke stelsel</type> <type key="ms" type="uksystem">Imperiale meetstelsel</type> <type key="ms" type="ussystem">VS-meetstelsel</type> <type key="numbers" type="arab">Arabies-Indiese syfers</type> @@ -736,7 +895,7 @@ <type key="numbers" type="greklow">Griekse kleinletter-syfers</type> <type key="numbers" type="gujr">Goedjarati-syfers</type> <type key="numbers" type="guru">Gurmukhi-syfers</type> - <type key="numbers" type="hanidec">Chinese desimale syfers</type> + <type key="numbers" type="hanidec">Sjinese desimale syfers</type> <type key="numbers" type="hans">Vereenvoudigde Sjinese syfers</type> <type key="numbers" type="hansfin">Vereenvoudigde Sjinese finansiële syfers</type> <type key="numbers" type="hant">Tradisionele Sjinese syfers</type> @@ -752,7 +911,7 @@ <type key="numbers" type="mong">Mongoliese syfers</type> <type key="numbers" type="mymr">Mianmar-syfers</type> <type key="numbers" type="native">Inheemse syfers</type> - <type key="numbers" type="orya">Oriya-syfers</type> + <type key="numbers" type="orya">Odia-syfers</type> <type key="numbers" type="roman">Romeinse syfers</type> <type key="numbers" type="romanlow">Romeinse kleinletter-syfers</type> <type key="numbers" type="taml">Tradisionele Tamil-syfers</type> @@ -763,18 +922,6 @@ <type key="numbers" type="traditional">Tradisionele syfers</type> <type key="numbers" type="vaii">Vai-syfers</type> </types> - <transformNames> - <transformName type="BGN">BGN</transformName> - <transformName type="Numeric">Numeries</transformName> - <transformName type="Tone">Toon</transformName> - <transformName type="UNGEGN">UNGEGN</transformName> - <transformName type="x-Accents">Aksente</transformName> - <transformName type="x-Fullwidth">Vollewydte</transformName> - <transformName type="x-Halfwidth">halfwydte</transformName> - <transformName type="x-Jamo">Jamo</transformName> - <transformName type="x-Pinyin">Pinyin</transformName> - <transformName type="x-Publishing">Publisering</transformName> - </transformNames> <measurementSystemNames> <measurementSystemName type="metric">Metriek</measurementSystemName> <measurementSystemName type="UK">VK</measurementSystemName> @@ -788,8 +935,9 @@ </localeDisplayNames> <characters> <exemplarCharacters>[a á â b c d e é è ê ë f g h i î ï j k l m n o ô ö p q r s t u û v w x y z]</exemplarCharacters> - <exemplarCharacters type="auxiliary">[à ä ã æ ç í ì ó ò ú ù ü ý]</exemplarCharacters> + <exemplarCharacters type="auxiliary">[à å ä ã æ ç í ì ó ò ú ù ü ý]</exemplarCharacters> <exemplarCharacters type="index" draft="contributed">[A B C D E F G H I J K L M N O P Q R S T U V W X Y Z]</exemplarCharacters> + <exemplarCharacters type="numbers">[ \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters> <exemplarCharacters type="punctuation">[\- ‐ – — , ; \: ! ? . … ' ‘ ’ " “ ” ( ) \[ \] § @ * / \& # † ‡ ′ ″]</exemplarCharacters> <ellipsis type="final">{0}…</ellipsis> <ellipsis type="initial">…{0}</ellipsis> @@ -852,18 +1000,27 @@ </dateTimeFormat> </dateTimeFormatLength> <availableFormats> + <dateFormatItem id="Bh">h B</dateFormatItem> + <dateFormatItem id="Bhm">hh:mm B</dateFormatItem> + <dateFormatItem id="Bhms">hh:mm:ss B</dateFormatItem> <dateFormatItem id="d">d</dateFormatItem> <dateFormatItem id="E">ccc</dateFormatItem> + <dateFormatItem id="EBhm">E hh:mm B</dateFormatItem> + <dateFormatItem id="EBhms">E hh:mm:ss B</dateFormatItem> <dateFormatItem id="Ed">E d</dateFormatItem> + <dateFormatItem id="Ehm">E hh:mm a</dateFormatItem> + <dateFormatItem id="EHm">E HH:mm</dateFormatItem> + <dateFormatItem id="Ehms">E hh:mm:ss a</dateFormatItem> + <dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem> <dateFormatItem id="Gy">y G</dateFormatItem> <dateFormatItem id="GyMMM">MMM y G</dateFormatItem> <dateFormatItem id="GyMMMd">d MMM y G</dateFormatItem> <dateFormatItem id="GyMMMEd">E d MMM y G</dateFormatItem> <dateFormatItem id="h">h a</dateFormatItem> <dateFormatItem id="H">HH</dateFormatItem> - <dateFormatItem id="hm">h:mm a</dateFormatItem> + <dateFormatItem id="hm">hh:mm a</dateFormatItem> <dateFormatItem id="Hm">HH:mm</dateFormatItem> - <dateFormatItem id="hms">h:mm:ss a</dateFormatItem> + <dateFormatItem id="hms">hh:mm:ss a</dateFormatItem> <dateFormatItem id="Hms">HH:mm:ss</dateFormatItem> <dateFormatItem id="M">L</dateFormatItem> <dateFormatItem id="Md">d/M</dateFormatItem> @@ -1259,7 +1416,7 @@ <era type="0">voor Christus</era> <era type="0" alt="variant">voor die gewone jaartelling</era> <era type="1">na Christus</era> - <era type="1" alt="variant">g.j.</era> + <era type="1" alt="variant">gewone jaartelling</era> </eraNames> <eraAbbr> <era type="0">v.C.</era> @@ -1271,7 +1428,7 @@ <era type="0">v.C.</era> <era type="0" alt="variant" draft="unconfirmed">vgj</era> <era type="1">n.C.</era> - <era type="1" alt="variant" draft="unconfirmed">vg</era> + <era type="1" alt="variant" draft="unconfirmed">gj</era> </eraNarrow> </eras> <dateFormats> @@ -1299,22 +1456,22 @@ <timeFormats> <timeFormatLength type="full"> <timeFormat> - <pattern>h:mm:ss a zzzz</pattern> + <pattern>HH:mm:ss zzzz</pattern> </timeFormat> </timeFormatLength> <timeFormatLength type="long"> <timeFormat> - <pattern>h:mm:ss a z</pattern> + <pattern>HH:mm:ss z</pattern> </timeFormat> </timeFormatLength> <timeFormatLength type="medium"> <timeFormat> - <pattern>h:mm:ss a</pattern> + <pattern>HH:mm:ss</pattern> </timeFormat> </timeFormatLength> <timeFormatLength type="short"> <timeFormat> - <pattern>h:mm a</pattern> + <pattern>HH:mm</pattern> </timeFormat> </timeFormatLength> </timeFormats> @@ -1340,8 +1497,13 @@ </dateTimeFormat> </dateTimeFormatLength> <availableFormats> + <dateFormatItem id="Bh">h B</dateFormatItem> + <dateFormatItem id="Bhm" draft="provisional">h:mm B</dateFormatItem> + <dateFormatItem id="Bhms" draft="provisional">h:mm:ss B</dateFormatItem> <dateFormatItem id="d">d</dateFormatItem> <dateFormatItem id="E">ccc</dateFormatItem> + <dateFormatItem id="EBhm" draft="provisional">E h:mm B</dateFormatItem> + <dateFormatItem id="EBhms" draft="provisional">E h:mm:ss B</dateFormatItem> <dateFormatItem id="Ed">E d</dateFormatItem> <dateFormatItem id="Ehm">E hh:mm a</dateFormatItem> <dateFormatItem id="EHm">E HH:mm</dateFormatItem> @@ -1369,6 +1531,8 @@ <dateFormatItem id="MMMEd">E d MMM</dateFormatItem> <dateFormatItem id="MMMMd">d MMM</dateFormatItem> <dateFormatItem id="MMMMEd">E d MMMM</dateFormatItem> + <dateFormatItem id="MMMMW" count="one">'week' W 'van' MMM</dateFormatItem> + <dateFormatItem id="MMMMW" count="other">'week' W 'van' MMM</dateFormatItem> <dateFormatItem id="ms">mm:ss</dateFormatItem> <dateFormatItem id="y">y</dateFormatItem> <dateFormatItem id="yM">MM-y</dateFormatItem> @@ -1380,6 +1544,8 @@ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem> <dateFormatItem id="yQQQ">QQQ y</dateFormatItem> <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem> + <dateFormatItem id="yw" count="one">'week' w 'van' Y</dateFormatItem> + <dateFormatItem id="yw" count="other">'week' w 'van' Y</dateFormatItem> </availableFormats> <appendItems> <appendItem request="Timezone">{0} {1}</appendItem> @@ -1486,6 +1652,12 @@ <field type="era"> <displayName>era</displayName> </field> + <field type="era-short"> + <displayName>era</displayName> + </field> + <field type="era-narrow"> + <displayName>era</displayName> + </field> <field type="year"> <displayName>jaar</displayName> <relative type="-1">verlede jaar</relative> @@ -1524,6 +1696,9 @@ </field> <field type="quarter"> <displayName>kwartaal</displayName> + <relative type="-1">vorige kwartaal</relative> + <relative type="0">hierdie kwartaal</relative> + <relative type="1">volgende kwartaal</relative> <relativeTime type="future"> <relativeTimePattern count="one">oor {0} kwartaal</relativeTimePattern> <relativeTimePattern count="other">oor {0} kwartale</relativeTimePattern> @@ -1556,7 +1731,7 @@ </relativeTime> </field> <field type="month"> - <displayName>Maand</displayName> + <displayName>maand</displayName> <relative type="-1">verlede maand</relative> <relative type="0">vandeesmaand</relative> <relative type="1">volgende maand</relative> @@ -1592,7 +1767,7 @@ </relativeTime> </field> <field type="week"> - <displayName>Week</displayName> + <displayName>week</displayName> <relative type="-1">verlede week</relative> <relative type="0">vandeesweek</relative> <relative type="1">volgende week</relative> @@ -1604,6 +1779,7 @@ <relativeTimePattern count="one">{0} week gelede</relativeTimePattern> <relativeTimePattern count="other">{0} weke gelede</relativeTimePattern> </relativeTime> + <relativePeriod>die week van {0}</relativePeriod> </field> <field type="week-short"> <displayName>wk.</displayName> @@ -1615,6 +1791,7 @@ <relativeTimePattern count="one">{0} w. gelede</relativeTimePattern> <relativeTimePattern count="other">{0} w. gelede</relativeTimePattern> </relativeTime> + <relativePeriod>die week van {0}</relativePeriod> </field> <field type="week-narrow"> <displayName>wk.</displayName> @@ -1626,17 +1803,27 @@ <relativeTimePattern count="one">{0} w. gelede</relativeTimePattern> <relativeTimePattern count="other">{0} w. gelede</relativeTimePattern> </relativeTime> + <relativePeriod>die week van {0}</relativePeriod> + </field> + <field type="weekOfMonth"> + <displayName>week van maand</displayName> + </field> + <field type="weekOfMonth-short"> + <displayName>wk. v. md.</displayName> + </field> + <field type="weekOfMonth-narrow"> + <displayName>wk. v. md.</displayName> </field> <field type="day"> - <displayName>Dag</displayName> + <displayName>dag</displayName> <relative type="-2">eergister</relative> <relative type="-1">gister</relative> <relative type="0">vandag</relative> <relative type="1">môre</relative> <relative type="2">oormôre</relative> <relativeTime type="future"> - <relativeTimePattern count="one">oor {0} minuut</relativeTimePattern> - <relativeTimePattern count="other">oor {0} minuut</relativeTimePattern> + <relativeTimePattern count="one">oor {0} dag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} dae</relativeTimePattern> </relativeTime> <relativeTime type="past"> <relativeTimePattern count="one">{0} dag gelede</relativeTimePattern> @@ -1675,119 +1862,318 @@ <relativeTimePattern count="other">{0} dae gelede</relativeTimePattern> </relativeTime> </field> + <field type="dayOfYear"> + <displayName>dag van jaar</displayName> + </field> + <field type="dayOfYear-short"> + <displayName>dag van j.</displayName> + </field> + <field type="dayOfYear-narrow"> + <displayName>dag van j.</displayName> + </field> <field type="weekday"> <displayName>dag van die week</displayName> </field> + <field type="weekday-short"> + <displayName>dag van wk.</displayName> + </field> + <field type="weekday-narrow"> + <displayName>dag van wk.</displayName> + </field> + <field type="weekdayOfMonth"> + <displayName>weekdag van die jaar</displayName> + </field> + <field type="weekdayOfMonth-short"> + <displayName>wk.-dag van md.</displayName> + </field> + <field type="weekdayOfMonth-narrow"> + <displayName>wk.-dag van md.</displayName> + </field> <field type="sun"> <relative type="-1">verlede Sondag</relative> <relative type="0">hierdie Sondag</relative> <relative type="1">volgende Sondag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Sondag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Sondae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Sondag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Sondae gelede</relativeTimePattern> + </relativeTime> </field> <field type="sun-short"> <relative type="-1">verlede Son.</relative> <relative type="0">hierdie Son.</relative> <relative type="1">volgende Son.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Sondae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Sondae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Sondae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Sondae gelede</relativeTimePattern> + </relativeTime> </field> <field type="sun-narrow"> <relative type="-1">verlede Son.</relative> <relative type="0">hierdie Son.</relative> <relative type="1">volgende Son.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Sondae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Sondae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Sondae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Sondae gelede</relativeTimePattern> + </relativeTime> </field> <field type="mon"> <relative type="-1">verlede Maandag</relative> <relative type="0">hierdie Maandag</relative> <relative type="1">volgende Maandag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Maandag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Maandae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Maandag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Maandae gelede</relativeTimePattern> + </relativeTime> </field> <field type="mon-short"> <relative type="-1">verlede Ma.</relative> <relative type="0">hierdie Ma.</relative> <relative type="1">volgende Ma.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Maandae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Maandae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Maandae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Maandae gelede</relativeTimePattern> + </relativeTime> </field> <field type="mon-narrow"> <relative type="-1">verlede Ma.</relative> <relative type="0">hierdie Ma.</relative> <relative type="1">volgende Ma.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Maandae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Maandae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Maandae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Maandae gelede</relativeTimePattern> + </relativeTime> </field> <field type="tue"> <relative type="-1">verlede Dinsdag</relative> <relative type="0">hierdie Dinsdag</relative> <relative type="1">volgende Dinsdag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Dinsdag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Dinsdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Dinsdag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Dinsdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="tue-short"> <relative type="-1">verlede Di.</relative> <relative type="0">hierdie Di.</relative> <relative type="1">volgende Di.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Dinsdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Dinsdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Dinsdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Dinsdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="tue-narrow"> <relative type="-1">verlede Di.</relative> <relative type="0">hierdie Di.</relative> <relative type="1">volgende Di.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Dinsdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Dinsdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Dinsdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Dinsdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="wed"> <relative type="-1">verlede Woensdag</relative> <relative type="0">hierdie Woensdag</relative> <relative type="1">volgende Woensdag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Woensdag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Woensdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Woensdag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Woensdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="wed-short"> <relative type="-1">verlede Wo.</relative> <relative type="0">hierdie Wo.</relative> <relative type="1">volgende Wo.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Woensdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Woensdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Woensdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Woensdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="wed-narrow"> <relative type="-1">verlede Wo.</relative> <relative type="0">hierdie Wo.</relative> <relative type="1">volgende Wo.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Woensdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Woensdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Woensdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Woensdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="thu"> <relative type="-1">verlede Donderdag</relative> <relative type="0">hierdie Donderdag</relative> <relative type="1">volgende Donderdag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Donderdag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Donderdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Donderdag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Donderdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="thu-short"> <relative type="-1">verlede Do.</relative> <relative type="0">hierdie Do.</relative> <relative type="1">volgende Do.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Donderdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Donderdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Donderdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Donderdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="thu-narrow"> <relative type="-1">verlede Do.</relative> <relative type="0">hierdie Do.</relative> <relative type="1">volgende Do.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Donderdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Donderdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Donderdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Donderdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="fri"> <relative type="-1">verlede Vrydag</relative> <relative type="0">hierdie Vrydag</relative> <relative type="1">volgende Vrydag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Vrydag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Vrydae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Vrydag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Vrydae gelede</relativeTimePattern> + </relativeTime> </field> <field type="fri-short"> <relative type="-1">verlede Vr.</relative> <relative type="0">dié Vr.</relative> <relative type="1">vlg. Vr.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Vrydae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Vrydae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Vrydae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Vrydae gelede</relativeTimePattern> + </relativeTime> </field> <field type="fri-narrow"> <relative type="-1">verlede Vr.</relative> <relative type="0">dié Vr.</relative> <relative type="1">vlg. Vr.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Vrydae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Vrydae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Vrydae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Vrydae gelede</relativeTimePattern> + </relativeTime> </field> <field type="sat"> <relative type="-1">verlede Saterdag</relative> <relative type="0">hierdie Saterdag</relative> <relative type="1">volgende Saterdag</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Saterdag</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Saterdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Saterdag gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Saterdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="sat-short"> <relative type="-1">verlede Sa.</relative> <relative type="0">dié Sa.</relative> <relative type="1">vlg. Sa.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Saterdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Saterdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Saterdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Saterdae gelede</relativeTimePattern> + </relativeTime> </field> <field type="sat-narrow"> <relative type="-1">verlede Sa.</relative> <relative type="0">dié Sa.</relative> <relative type="1">vlg. Sa.</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">oor {0} Saterdae</relativeTimePattern> + <relativeTimePattern count="other">oor {0} Saterdae</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">{0} Saterdae gelede</relativeTimePattern> + <relativeTimePattern count="other">{0} Saterdae gelede</relativeTimePattern> + </relativeTime> + </field> + <field type="dayperiod-short"> + <displayName>vm./nm.</displayName> </field> <field type="dayperiod"> <displayName>VM/NM</displayName> </field> + <field type="dayperiod-narrow"> + <displayName>vm./nm.</displayName> + </field> <field type="hour"> <displayName>uur</displayName> + <relative type="0">hierdie uur</relative> <relativeTime type="future"> <relativeTimePattern count="one">oor {0} uur</relativeTimePattern> <relativeTimePattern count="other">oor {0} uur</relativeTimePattern> @@ -1821,6 +2207,7 @@ </field> <field type="minute"> <displayName>minuut</displayName> + <relative type="0">hierdie minuut</relative> <relativeTime type="future"> <relativeTimePattern count="one">oor {0} minuut</relativeTimePattern> <relativeTimePattern count="other">oor {0} minuut</relativeTimePattern> @@ -1889,6 +2276,12 @@ <field type="zone"> <displayName>tydsone</displayName> </field> + <field type="zone-short"> + <displayName>sone</displayName> + </field> + <field type="zone-narrow"> + <displayName>sone</displayName> + </field> </fields> <timeZoneNames> <hourFormat>+HH:mm;-HH:mm</hourFormat> @@ -1898,6 +2291,17 @@ <regionFormat type="daylight">{0}-dagligtyd</regionFormat> <regionFormat type="standard">{0}-standaardtyd</regionFormat> <fallbackFormat>{1} ({0})</fallbackFormat> + <zone type="America/Santa_Isabel"> + <exemplarCity>Santa Isabel</exemplarCity> + </zone> + <zone type="Pacific/Honolulu"> + <exemplarCity>Honolulu</exemplarCity> + </zone> + <zone type="Etc/UTC"> + <long> + <standard>Gekoördineerde universele tyd</standard> + </long> + </zone> <zone type="Etc/Unknown"> <exemplarCity>Onbekende stad</exemplarCity> </zone> @@ -1905,10 +2309,10 @@ <exemplarCity>Andorra</exemplarCity> </zone> <zone type="Asia/Dubai"> - <exemplarCity>Dubai</exemplarCity> + <exemplarCity>Doebai</exemplarCity> </zone> <zone type="Asia/Kabul"> - <exemplarCity>Kabul</exemplarCity> + <exemplarCity>Kaboel</exemplarCity> </zone> <zone type="America/Antigua"> <exemplarCity>Antigua</exemplarCity> @@ -1944,7 +2348,7 @@ <exemplarCity>Davis</exemplarCity> </zone> <zone type="Antarctica/Vostok"> - <exemplarCity>Vostok</exemplarCity> + <exemplarCity>Wostok</exemplarCity> </zone> <zone type="Antarctica/Casey"> <exemplarCity>Casey</exemplarCity> @@ -2162,6 +2566,9 @@ <zone type="America/Vancouver"> <exemplarCity>Vancouver</exemplarCity> </zone> + <zone type="America/Fort_Nelson"> + <exemplarCity>Fort Nelson</exemplarCity> + </zone> <zone type="America/Dawson_Creek"> <exemplarCity>Dawson Creek</exemplarCity> </zone> @@ -2190,7 +2597,7 @@ <exemplarCity>Resolute</exemplarCity> </zone> <zone type="America/Rainy_River"> - <exemplarCity>Rainy River</exemplarCity> + <exemplarCity>Rainyrivier</exemplarCity> </zone> <zone type="America/Rankin_Inlet"> <exemplarCity>Rankin Inlet</exemplarCity> @@ -2258,6 +2665,9 @@ <zone type="Pacific/Easter"> <exemplarCity>Paas</exemplarCity> </zone> + <zone type="America/Punta_Arenas"> + <exemplarCity>Punta Arenas</exemplarCity> + </zone> <zone type="America/Santiago"> <exemplarCity>Santiago</exemplarCity> </zone> @@ -2286,11 +2696,14 @@ <exemplarCity>Curaçao</exemplarCity> </zone> <zone type="Indian/Christmas"> - <exemplarCity>Kers</exemplarCity> + <exemplarCity>Christmas</exemplarCity> </zone> <zone type="Asia/Nicosia"> <exemplarCity>Nicosia</exemplarCity> </zone> + <zone type="Asia/Famagusta"> + <exemplarCity>Famagusta</exemplarCity> + </zone> <zone type="Europe/Prague"> <exemplarCity>Praag</exemplarCity> </zone> @@ -2454,7 +2867,7 @@ <exemplarCity>Boedapest</exemplarCity> </zone> <zone type="Asia/Jakarta"> - <exemplarCity>Jakarta</exemplarCity> + <exemplarCity>Djakarta</exemplarCity> </zone> <zone type="Asia/Pontianak"> <exemplarCity>Pontianak</exemplarCity> @@ -2505,7 +2918,7 @@ <exemplarCity>Amman</exemplarCity> </zone> <zone type="Asia/Tokyo"> - <exemplarCity>Tokyo</exemplarCity> + <exemplarCity>Tokio</exemplarCity> </zone> <zone type="Africa/Nairobi"> <exemplarCity>Nairobi</exemplarCity> @@ -2547,7 +2960,10 @@ <exemplarCity>Aqtau</exemplarCity> </zone> <zone type="Asia/Oral"> - <exemplarCity>Oeral</exemplarCity> + <exemplarCity>Oral</exemplarCity> + </zone> + <zone type="Asia/Atyrau"> + <exemplarCity>Atyrau</exemplarCity> </zone> <zone type="Asia/Aqtobe"> <exemplarCity>Aqtobe</exemplarCity> @@ -2622,13 +3038,13 @@ <exemplarCity>Bamako</exemplarCity> </zone> <zone type="Asia/Rangoon"> - <exemplarCity>Rangoen</exemplarCity> + <exemplarCity>Yangon</exemplarCity> </zone> <zone type="Asia/Hovd"> <exemplarCity>Hovd</exemplarCity> </zone> <zone type="Asia/Ulaanbaatar"> - <exemplarCity>Ulaanbatar</exemplarCity> + <exemplarCity>Ulaanbaatar</exemplarCity> </zone> <zone type="Asia/Choibalsan"> <exemplarCity>Choibalsan</exemplarCity> @@ -2663,9 +3079,6 @@ <zone type="America/Tijuana"> <exemplarCity>Tijuana</exemplarCity> </zone> - <zone type="America/Santa_Isabel"> - <exemplarCity>Santa Isabel</exemplarCity> - </zone> <zone type="America/Hermosillo"> <exemplarCity>Hermosillo</exemplarCity> </zone> @@ -2697,7 +3110,7 @@ <exemplarCity>Cancun</exemplarCity> </zone> <zone type="Asia/Kuala_Lumpur"> - <exemplarCity>Kuala Lumpur</exemplarCity> + <exemplarCity>Koeala-Loempoer</exemplarCity> </zone> <zone type="Asia/Kuching"> <exemplarCity>Kuching</exemplarCity> @@ -2829,7 +3242,19 @@ <exemplarCity>Moskou</exemplarCity> </zone> <zone type="Europe/Volgograd"> - <exemplarCity>Volgograd</exemplarCity> + <exemplarCity>Wolgograd</exemplarCity> + </zone> + <zone type="Europe/Saratov"> + <exemplarCity>Saratof</exemplarCity> + </zone> + <zone type="Europe/Astrakhan"> + <exemplarCity>Astrakhan</exemplarCity> + </zone> + <zone type="Europe/Ulyanovsk"> + <exemplarCity>Ulyanovsk</exemplarCity> + </zone> + <zone type="Europe/Kirov"> + <exemplarCity>Kirov</exemplarCity> </zone> <zone type="Europe/Samara"> <exemplarCity>Samara</exemplarCity> @@ -2843,11 +3268,17 @@ <zone type="Asia/Novosibirsk"> <exemplarCity>Novosibirsk</exemplarCity> </zone> + <zone type="Asia/Barnaul"> + <exemplarCity>Barnaul</exemplarCity> + </zone> + <zone type="Asia/Tomsk"> + <exemplarCity>Tomsk</exemplarCity> + </zone> <zone type="Asia/Novokuznetsk"> <exemplarCity>Novokuznetsk</exemplarCity> </zone> <zone type="Asia/Krasnoyarsk"> - <exemplarCity>Krasnoyarsk</exemplarCity> + <exemplarCity>Krasnojarsk</exemplarCity> </zone> <zone type="Asia/Irkutsk"> <exemplarCity>Irkutsk</exemplarCity> @@ -2859,7 +3290,7 @@ <exemplarCity>Jakoetsk</exemplarCity> </zone> <zone type="Asia/Vladivostok"> - <exemplarCity>Vladivostok</exemplarCity> + <exemplarCity>Wladiwostok</exemplarCity> </zone> <zone type="Asia/Khandyga"> <exemplarCity>Khandyga</exemplarCity> @@ -2877,7 +3308,7 @@ <exemplarCity>Srednekolymsk</exemplarCity> </zone> <zone type="Asia/Kamchatka"> - <exemplarCity>Kamchatka</exemplarCity> + <exemplarCity>Kamtsjatka</exemplarCity> </zone> <zone type="Asia/Anadyr"> <exemplarCity>Anadyr</exemplarCity> @@ -3011,9 +3442,6 @@ <zone type="Pacific/Midway"> <exemplarCity>Midway</exemplarCity> </zone> - <zone type="Pacific/Johnston"> - <exemplarCity>Johnston</exemplarCity> - </zone> <zone type="Pacific/Wake"> <exemplarCity>Wake</exemplarCity> </zone> @@ -3023,8 +3451,8 @@ <zone type="America/Nome"> <exemplarCity>Nome</exemplarCity> </zone> - <zone type="Pacific/Honolulu"> - <exemplarCity>Honolulu</exemplarCity> + <zone type="Pacific/Johnston"> + <exemplarCity>Johnston</exemplarCity> </zone> <zone type="America/Anchorage"> <exemplarCity>Anchorage</exemplarCity> @@ -3054,13 +3482,13 @@ <exemplarCity>Denver</exemplarCity> </zone> <zone type="America/North_Dakota/Beulah"> - <exemplarCity>Beulah, North Dakota</exemplarCity> + <exemplarCity>Beulah, Noord-Dakota</exemplarCity> </zone> <zone type="America/North_Dakota/New_Salem"> - <exemplarCity>New Salem, North Dakota</exemplarCity> + <exemplarCity>New Salem, Noord-Dakota</exemplarCity> </zone> <zone type="America/North_Dakota/Center"> - <exemplarCity>Center, North Dakota</exemplarCity> + <exemplarCity>Center, Noord-Dakota</exemplarCity> </zone> <zone type="America/Chicago"> <exemplarCity>Chicago</exemplarCity> @@ -3157,7 +3585,7 @@ </zone> <metazone type="Afghanistan"> <long> - <standard>Afghanistan-tyd</standard> + <standard>Afganistan-tyd</standard> </long> </metazone> <metazone type="Africa_Central"> @@ -3212,23 +3640,23 @@ </metazone> <metazone type="America_Central"> <long> - <generic>Sentrale tyd</generic> - <standard>Sentrale standaardtyd</standard> - <daylight>Sentrale dagligtyd</daylight> + <generic>Noord-Amerikaanse sentrale tyd</generic> + <standard>Noord-Amerikaanse sentrale standaardtyd</standard> + <daylight>Noord-Amerikaanse sentrale dagligtyd</daylight> </long> </metazone> <metazone type="America_Eastern"> <long> - <generic>Oostelike tyd</generic> - <standard>Oostelike standaardtyd</standard> - <daylight>Oostelike dagligtyd</daylight> + <generic>Noord-Amerikaanse oostelike tyd</generic> + <standard>Noord-Amerikaanse oostelike standaardtyd</standard> + <daylight>Noord-Amerikaanse oostelike dagligtyd</daylight> </long> </metazone> <metazone type="America_Mountain"> <long> - <generic>Bergtyd</generic> - <standard>Berg-standaardtyd</standard> - <daylight>Berg-dagligtyd</daylight> + <generic>Noord-Amerikaanse bergtyd</generic> + <standard>Noord-Amerikaanse berg-standaardtyd</standard> + <daylight>Noord-Amerikaanse berg-dagligtyd</daylight> </long> </metazone> <metazone type="America_Pacific"> @@ -3289,30 +3717,30 @@ </metazone> <metazone type="Australia_Central"> <long> - <generic>Sentraal-Australië-tyd</generic> - <standard>Australiese sentraal-standaardtyd</standard> - <daylight>Australiese sentrale dagligtyd</daylight> + <generic>Sentraal-Australiese tyd</generic> + <standard>Sentraal-Australiese standaardtyd</standard> + <daylight>Sentraal-Australiese dagligtyd</daylight> </long> </metazone> <metazone type="Australia_CentralWestern"> <long> - <generic>Australiese sentraal-Westelike tyd</generic> - <standard>Australiese sentraal-Westelike standaard-tyd</standard> - <daylight>Australiese sentraal-Westelike dagligtyd</daylight> + <generic>Sentraal-westelike Australiese tyd</generic> + <standard>Sentraal-westelike Australiese standaard-tyd</standard> + <daylight>Sentraal-westelike Australiese dagligtyd</daylight> </long> </metazone> <metazone type="Australia_Eastern"> <long> <generic>Oostelike Australiese tyd</generic> - <standard>Australiese Oostelike standaardtyd</standard> - <daylight>Australiese Oostelike dagligtyd</daylight> + <standard>Oostelike Australiese standaardtyd</standard> + <daylight>Oostelike Australiese dagligtyd</daylight> </long> </metazone> <metazone type="Australia_Western"> <long> - <generic>Westelike Australië-tyd</generic> - <standard>Australiese Westelike standaardtyd</standard> - <daylight>Australiese Westelike dagligtyd</daylight> + <generic>Westelike Australiese tyd</generic> + <standard>Westelike Australiese standaardtyd</standard> + <daylight>Westelike Australiese dagligtyd</daylight> </long> </metazone> <metazone type="Azerbaijan"> @@ -3348,9 +3776,9 @@ </metazone> <metazone type="Brasilia"> <long> - <generic>Brasilië-tyd</generic> - <standard>Brasilië-standaardtyd</standard> - <daylight>Brasilië somertyd</daylight> + <generic>Brasilia-tyd</generic> + <standard>Brasilia-standaardtyd</standard> + <daylight>Brasilia-somertyd</daylight> </long> </metazone> <metazone type="Brunei"> @@ -3400,12 +3828,12 @@ </metazone> <metazone type="Christmas"> <long> - <standard>Kersfeeseiland-tyd</standard> + <standard>Christmaseiland-tyd</standard> </long> </metazone> <metazone type="Cocos"> <long> - <standard>Cocoseilande-tyd</standard> + <standard>Kokoseilande-tyd</standard> </long> </metazone> <metazone type="Colombia"> @@ -3472,7 +3900,7 @@ </metazone> <metazone type="Europe_Further_Eastern"> <long> - <standard>Verder-oosterse Europese Tyd</standard> + <standard>Verder-oos-Europese tyd</standard> </long> </metazone> <metazone type="Europe_Western"> @@ -3530,7 +3958,7 @@ </metazone> <metazone type="GMT"> <long> - <standard>Greenwich-mediaantyd</standard> + <standard>Greenwich-tyd</standard> </long> </metazone> <metazone type="Greenland_Eastern"> @@ -3549,7 +3977,7 @@ </metazone> <metazone type="Gulf"> <long> - <standard>Golf-standaardtyd</standard> + <standard>Persiese Golf-standaardtyd</standard> </long> </metazone> <metazone type="Guyana"> @@ -3559,9 +3987,9 @@ </metazone> <metazone type="Hawaii_Aleutian"> <long> - <generic>Hawaii-Aleusiër-tyd</generic> - <standard>Hawaii-Aleusiër-standaardtyd</standard> - <daylight>Hawaii-Aleusiër-dagligtyd</daylight> + <generic>Hawaii-Aleoete-tyd</generic> + <standard>Hawaii-Aleoete-standaardtyd</standard> + <daylight>Hawaii-Aleoete-dagligtyd</daylight> </long> </metazone> <metazone type="Hong_Kong"> @@ -3595,7 +4023,7 @@ </metazone> <metazone type="Indonesia_Central"> <long> - <standard>Sentraal Indonesië-tyd</standard> + <standard>Sentraal-Indonesiese tyd</standard> </long> </metazone> <metazone type="Indonesia_Eastern"> @@ -3749,9 +4177,9 @@ </metazone> <metazone type="Mongolia"> <long> - <generic>Ulaanbatar-tyd</generic> - <standard>Ulaanbatar-standaardtyd</standard> - <daylight>Ulaanbatar-somertyd</daylight> + <generic>Ulaanbaatar-tyd</generic> + <standard>Ulaanbaatar-standaardtyd</standard> + <daylight>Ulaanbaatar-somertyd</daylight> </long> </metazone> <metazone type="Moscow"> @@ -3804,7 +4232,7 @@ </metazone> <metazone type="Norfolk"> <long> - <standard>Norfolkeilande-tyd</standard> + <standard>Norfolkeiland-tyd</standard> </long> </metazone> <metazone type="Noronha"> @@ -3888,9 +4316,14 @@ <standard>Ponape-tyd</standard> </long> </metazone> + <metazone type="Pyongyang"> + <long> + <standard>Pyongyang-tyd</standard> + </long> + </metazone> <metazone type="Reunion"> <long> - <standard>Reunion-tyd</standard> + <standard>Réunion-tyd</standard> </long> </metazone> <metazone type="Rothera"> @@ -3931,7 +4364,7 @@ </metazone> <metazone type="Solomon"> <long> - <standard>Solomoneilande-tyd</standard> + <standard>Salomonseilande-tyd</standard> </long> </metazone> <metazone type="South_Georgia"> @@ -4023,21 +4456,21 @@ </metazone> <metazone type="Vladivostok"> <long> - <generic>Vladivostok-tyd</generic> - <standard>Vladivostok-standaardtyd</standard> - <daylight>Vladivostok-somertyd</daylight> + <generic>Wladiwostok-tyd</generic> + <standard>Wladiwostok-standaardtyd</standard> + <daylight>Wladiwostok-somertyd</daylight> </long> </metazone> <metazone type="Volgograd"> <long> - <generic>Volgograd-tyd</generic> - <standard>Volgograd-standaardtyd</standard> - <daylight>Volgograd-somertyd</daylight> + <generic>Wolgograd-tyd</generic> + <standard>Wolgograd-standaardtyd</standard> + <daylight>Wolgograd-somertyd</daylight> </long> </metazone> <metazone type="Vostok"> <long> - <standard>Vostok-tyd</standard> + <standard>Wostok-tyd</standard> </long> </metazone> <metazone type="Wake"> @@ -4122,12 +4555,12 @@ </decimalFormatLength> <decimalFormatLength type="short"> <decimalFormat> - <pattern type="1000" count="one">0</pattern> - <pattern type="1000" count="other">0</pattern> - <pattern type="10000" count="one">0</pattern> - <pattern type="10000" count="other">0</pattern> - <pattern type="100000" count="one">0</pattern> - <pattern type="100000" count="other">0</pattern> + <pattern type="1000" count="one">0 k</pattern> + <pattern type="1000" count="other">0 k</pattern> + <pattern type="10000" count="one">00 k</pattern> + <pattern type="10000" count="other">00 k</pattern> + <pattern type="100000" count="one">000 k</pattern> + <pattern type="100000" count="other">000 k</pattern> <pattern type="1000000" count="one">0 m</pattern> <pattern type="1000000" count="other">0 m</pattern> <pattern type="10000000" count="one">00 m</pattern> @@ -4174,12 +4607,12 @@ </currencyFormatLength> <currencyFormatLength type="short"> <currencyFormat type="standard"> - <pattern type="1000" count="one">¤0K</pattern> - <pattern type="1000" count="other">¤0K</pattern> - <pattern type="10000" count="one">¤00K</pattern> - <pattern type="10000" count="other">¤00K</pattern> - <pattern type="100000" count="one">¤ 000K</pattern> - <pattern type="100000" count="other">¤ 000K</pattern> + <pattern type="1000" count="one">¤0 k</pattern> + <pattern type="1000" count="other">¤0 k</pattern> + <pattern type="10000" count="one">¤00 k</pattern> + <pattern type="10000" count="other">¤00 k</pattern> + <pattern type="100000" count="one">¤000 k</pattern> + <pattern type="100000" count="other">¤000 k</pattern> <pattern type="1000000" count="one">¤0 m</pattern> <pattern type="1000000" count="other">¤0 m</pattern> <pattern type="10000000" count="one">¤00 m</pattern> @@ -4354,12 +4787,18 @@ <symbol>BWP</symbol> <symbol alt="narrow" draft="contributed">P</symbol> </currency> - <currency type="BYR"> + <currency type="BYN"> <displayName>Belo-Russiese roebel</displayName> <displayName count="one">Belo-Russiese roebel</displayName> <displayName count="other">Belo-Russiese roebel</displayName> + <symbol>BYN</symbol> + <symbol alt="narrow" draft="contributed">р.</symbol> + </currency> + <currency type="BYR"> + <displayName>Belo-Russiese roebel (2000–2016)</displayName> + <displayName count="one">Belo-Russiese roebel (2000–2016)</displayName> + <displayName count="other">Belo-Russiese roebel (2000–2016)</displayName> <symbol>BYR</symbol> - <symbol alt="narrow" draft="contributed">р.</symbol> </currency> <currency type="BZD"> <displayName>Beliziese dollar</displayName> @@ -4394,6 +4833,12 @@ <symbol>CLP</symbol> <symbol alt="narrow" draft="contributed">$</symbol> </currency> + <currency type="CNH"> + <displayName>Chinese joean</displayName> + <displayName count="one">Chinese joean (buiteland)</displayName> + <displayName count="other">Chinese joean (buiteland)</displayName> + <symbol draft="contributed">CNH</symbol> + </currency> <currency type="CNY"> <displayName>Sjinese joean renminbi</displayName> <displayName count="one">Sjinese joean renminbi</displayName> @@ -4520,6 +4965,7 @@ <displayName count="one">Georgiese lari</displayName> <displayName count="other">Georgiese lari</displayName> <symbol>GEL</symbol> + <symbol alt="narrow" draft="contributed">₾</symbol> <symbol alt="variant" draft="contributed">₾</symbol> </currency> <currency type="GHC"> @@ -4817,10 +5263,15 @@ <symbol>MOP</symbol> </currency> <currency type="MRO"> + <displayName>Mauritaniese ouguiya (1973–2017)</displayName> + <displayName count="one">Mauritaniese ouguiya (1973–2017)</displayName> + <displayName count="other">Mauritaniese ouguiya (1973–2017)</displayName> + <symbol>MRO</symbol> + </currency> + <currency type="MRU"> <displayName>Mauritaniese ouguiya</displayName> <displayName count="one">Mauritaniese ouguiya</displayName> <displayName count="other">Mauritaniese ouguiya</displayName> - <symbol>MRO</symbol> </currency> <currency type="MUR"> <displayName>Mauritiaanse rupee</displayName> @@ -4919,9 +5370,9 @@ <symbol>PAB</symbol> </currency> <currency type="PEN"> - <displayName>Peruaanse nuwe sol</displayName> - <displayName count="one">Peruaanse nuwe sol</displayName> - <displayName count="other">Peruaanse nuwe sol</displayName> + <displayName>Peruaanse sol</displayName> + <displayName count="one">Peruaanse sol</displayName> + <displayName count="other">Peruaanse sol</displayName> <symbol>PEN</symbol> </currency> <currency type="PGK"> @@ -4969,6 +5420,7 @@ <displayName count="one">Roemeense leu</displayName> <displayName count="other">Roemeense leu</displayName> <symbol>RON</symbol> + <symbol alt="narrow" draft="contributed">leu</symbol> </currency> <currency type="RSD"> <displayName>Serbiese dinar</displayName> @@ -5067,10 +5519,15 @@ <symbol alt="narrow" draft="contributed">£</symbol> </currency> <currency type="STD"> + <displayName>São Tomé en Príncipe dobra (1977–2017)</displayName> + <displayName count="one">São Tomé en Príncipe dobra (1977–2017)</displayName> + <displayName count="other">São Tomé en Príncipe dobra (1977–2017)</displayName> + <symbol>STD</symbol> + </currency> + <currency type="STN"> <displayName>São Tomé en Príncipe dobra</displayName> <displayName count="one">São Tomé en Príncipe dobra</displayName> <displayName count="other">São Tomé en Príncipe dobra</displayName> - <symbol>STD</symbol> <symbol alt="narrow" draft="contributed">Db</symbol> </currency> <currency type="SYP"> @@ -5269,6 +5726,11 @@ <pattern type="atLeast">{0}+</pattern> <pattern type="range">{0}–{1}</pattern> </miscPatterns> + <minimalPairs> + <pluralMinimalPairs count="one">{0} dag</pluralMinimalPairs> + <pluralMinimalPairs count="other">{0} dae</pluralMinimalPairs> + <ordinalMinimalPairs ordinal="other">Neem die {0}e afdraai na regs.</ordinalMinimalPairs> + </minimalPairs> </numbers> <units> <unitLength type="long"> @@ -5314,6 +5776,7 @@ <displayName>vierkante kilometer</displayName> <unitPattern count="one">{0} vierkante kilometer</unitPattern> <unitPattern count="other">{0} vierkante kilometer</unitPattern> + <perUnitPattern>{0} per vierkante kilometer</perUnitPattern> </unit> <unit type="area-hectare"> <displayName>hektaar</displayName> @@ -5336,6 +5799,7 @@ <displayName>vierkante myl</displayName> <unitPattern count="one">{0} vierkante myl</unitPattern> <unitPattern count="other">{0} vierkante myl</unitPattern> + <perUnitPattern>{0} per vierkante myl</perUnitPattern> </unit> <unit type="area-acre"> <displayName>akker</displayName> @@ -5359,9 +5823,24 @@ <perUnitPattern>{0} per vierkante duim</perUnitPattern> </unit> <unit type="concentr-karat"> - <displayName>karat</displayName> - <unitPattern count="one">{0} karat</unitPattern> - <unitPattern count="other">{0} karat</unitPattern> + <displayName>karaat</displayName> + <unitPattern count="one">{0} karaat</unitPattern> + <unitPattern count="other">{0} karaat</unitPattern> + </unit> + <unit type="concentr-milligram-per-deciliter"> + <displayName>milligram per desiliter</displayName> + <unitPattern count="one">{0} milligram per desiliter</unitPattern> + <unitPattern count="other">{0} milligram per desiliter</unitPattern> + </unit> + <unit type="concentr-millimole-per-liter"> + <displayName>millimol per liter</displayName> + <unitPattern count="one">{0} millimol per liter</unitPattern> + <unitPattern count="other">{0} millimol per liter</unitPattern> + </unit> + <unit type="concentr-part-per-million"> + <displayName>dele per miljoen</displayName> + <unitPattern count="one">{0} dele per miljoen</unitPattern> + <unitPattern count="other">{0} dele per miljoen</unitPattern> </unit> <unit type="consumption-liter-per-kilometer"> <displayName>liter per kilometer</displayName> @@ -5378,6 +5857,11 @@ <unitPattern count="one">{0} myl per gelling</unitPattern> <unitPattern count="other">{0} myl per gelling</unitPattern> </unit> + <unit type="consumption-mile-per-gallon-imperial"> + <displayName>myl per imp. gelling</displayName> + <unitPattern count="one">{0} myl per imp. gelling</unitPattern> + <unitPattern count="other">{0} myl per imp. gelling</unitPattern> + </unit> <unit type="digital-terabyte"> <displayName>TB</displayName> <unitPattern count="one">{0} TB</unitPattern> @@ -5650,15 +6134,20 @@ <unitPattern count="one">{0} skandinawiese myl</unitPattern> <unitPattern count="other">{0} skandinawiese myl</unitPattern> </unit> + <unit type="length-point"> + <displayName>punte</displayName> + <unitPattern count="one">{0} punt</unitPattern> + <unitPattern count="other">{0} punte</unitPattern> + </unit> <unit type="light-lux"> <displayName>lux</displayName> <unitPattern count="one">{0} lux</unitPattern> <unitPattern count="other">{0} lux</unitPattern> </unit> <unit type="mass-metric-ton"> - <displayName>t</displayName> - <unitPattern count="one">{0} t</unitPattern> - <unitPattern count="other">{0} t</unitPattern> + <displayName>metrieke ton</displayName> + <unitPattern count="one">{0} metrieke ton</unitPattern> + <unitPattern count="other">{0} metrieke ton</unitPattern> </unit> <unit type="mass-kilogram"> <displayName>kilogram</displayName> @@ -5893,6 +6382,12 @@ <unitPattern count="other">{0} gelling</unitPattern> <perUnitPattern>{0} per gelling</perUnitPattern> </unit> + <unit type="volume-gallon-imperial"> + <displayName>imp. gelling</displayName> + <unitPattern count="one">{0} imp. gelling</unitPattern> + <unitPattern count="other">{0} imp. gelling</unitPattern> + <perUnitPattern>{0}/imp. gel.</perUnitPattern> + </unit> <unit type="volume-quart"> <displayName>kwarte</displayName> <unitPattern count="one">{0} kwart</unitPattern> @@ -5973,6 +6468,7 @@ <displayName>km²</displayName> <unitPattern count="one">{0} km²</unitPattern> <unitPattern count="other">{0} km²</unitPattern> + <perUnitPattern>{0}/km²</perUnitPattern> </unit> <unit type="area-hectare"> <displayName>hektaar</displayName> @@ -5995,6 +6491,7 @@ <displayName>myl²</displayName> <unitPattern count="one">{0} myl²</unitPattern> <unitPattern count="other">{0} myl²</unitPattern> + <perUnitPattern>{0}/myl²</perUnitPattern> </unit> <unit type="area-acre"> <displayName>akker</displayName> @@ -6018,10 +6515,25 @@ <perUnitPattern>{0}/dm.²</perUnitPattern> </unit> <unit type="concentr-karat"> - <displayName>karat</displayName> + <displayName>karaat</displayName> <unitPattern count="one">{0} kar.</unitPattern> <unitPattern count="other">{0} kar.</unitPattern> </unit> + <unit type="concentr-milligram-per-deciliter"> + <displayName>mg/dℓ</displayName> + <unitPattern count="one">{0} mg/dℓ</unitPattern> + <unitPattern count="other">{0} mg/dℓ</unitPattern> + </unit> + <unit type="concentr-millimole-per-liter"> + <displayName>millimol/ℓ</displayName> + <unitPattern count="one">{0} mmol/ℓ</unitPattern> + <unitPattern count="other">{0} mmol/ℓ</unitPattern> + </unit> + <unit type="concentr-part-per-million"> + <displayName>dele/miljoen</displayName> + <unitPattern count="one">{0} d.p.m.</unitPattern> + <unitPattern count="other">{0} d.p.m.</unitPattern> + </unit> <unit type="consumption-liter-per-kilometer"> <displayName>liter/km</displayName> <unitPattern count="one">{0} ℓ/km</unitPattern> @@ -6033,10 +6545,15 @@ <unitPattern count="other">{0} ℓ/100km</unitPattern> </unit> <unit type="consumption-mile-per-gallon"> - <displayName>myl/gelling</displayName> + <displayName>myl/gel.</displayName> <unitPattern count="one">{0} m.p.g.</unitPattern> <unitPattern count="other">{0} m.p.g.</unitPattern> </unit> + <unit type="consumption-mile-per-gallon-imperial"> + <displayName>myl/imp. gel.</displayName> + <unitPattern count="one">{0} m.p.imp.g.</unitPattern> + <unitPattern count="other">{0} m.p.imp.g.</unitPattern> + </unit> <unit type="digital-terabyte"> <displayName>TB</displayName> <unitPattern count="one">{0} TB</unitPattern> @@ -6309,6 +6826,11 @@ <unitPattern count="one">{0} smi</unitPattern> <unitPattern count="other">{0} smi</unitPattern> </unit> + <unit type="length-point"> + <displayName>punte</displayName> + <unitPattern count="one">{0} pt.</unitPattern> + <unitPattern count="other">{0} pt.</unitPattern> + </unit> <unit type="light-lux"> <displayName>lux</displayName> <unitPattern count="one">{0} lux</unitPattern> @@ -6552,6 +7074,12 @@ <unitPattern count="other">{0} gell.</unitPattern> <perUnitPattern>{0}/gell.</perUnitPattern> </unit> + <unit type="volume-gallon-imperial"> + <displayName>imp. gel.</displayName> + <unitPattern count="one">{0} imp. gel.</unitPattern> + <unitPattern count="other">{0} imp. gel.</unitPattern> + <perUnitPattern>{0}/imp. gel.</perUnitPattern> + </unit> <unit type="volume-quart"> <displayName>kw.</displayName> <unitPattern count="one">{0} kw.</unitPattern> @@ -6823,6 +7351,18 @@ <listPatternPart type="end">{0} en {1}</listPatternPart> <listPatternPart type="2">{0} en {1}</listPatternPart> </listPattern> + <listPattern type="or"> + <listPatternPart type="start">{0}, {1}</listPatternPart> + <listPatternPart type="middle">{0}, {1}</listPatternPart> + <listPatternPart type="end">{0} of {1}</listPatternPart> + <listPatternPart type="2">{0} of {1}</listPatternPart> + </listPattern> + <listPattern type="standard-short"> + <listPatternPart type="start">{0}, {1}</listPatternPart> + <listPatternPart type="middle">{0}, {1}</listPatternPart> + <listPatternPart type="end">{0} en {1}</listPatternPart> + <listPatternPart type="2">{0} en {1}</listPatternPart> + </listPattern> <listPattern type="unit"> <listPatternPart type="start">{0}, {1}</listPatternPart> <listPatternPart type="middle">{0}, {1}</listPatternPart> @@ -6848,5 +7388,103 @@ <nostr>nee:n</nostr> </messages> </posix> + <characterLabels> + <characterLabelPattern type="all">{0} – Alle</characterLabelPattern> + <characterLabelPattern type="category-list">{0}: {1}</characterLabelPattern> + <characterLabelPattern type="compatibility">{0} – Versoenbaarheid</characterLabelPattern> + <characterLabelPattern type="enclosed">{0} – Ingesluit</characterLabelPattern> + <characterLabelPattern type="extended">{0} – Uitgebreid</characterLabelPattern> + <characterLabelPattern type="historic">{0} – Histories</characterLabelPattern> + <characterLabelPattern type="miscellaneous">{0} – Allerlei</characterLabelPattern> + <characterLabelPattern type="other">{0} – Ander</characterLabelPattern> + <characterLabelPattern type="scripts">Skrifte – {0}</characterLabelPattern> + <characterLabelPattern type="strokes" count="one">{0} hale</characterLabelPattern> + <characterLabelPattern type="strokes" count="other">{0} hale</characterLabelPattern> + <characterLabel type="activities">Aktiwiteite</characterLabel> + <characterLabel type="african_scripts">Afrika-skrifte</characterLabel> + <characterLabel type="american_scripts">Amerikaanse skrifte</characterLabel> + <characterLabel type="animal">dier</characterLabel> + <characterLabel type="animals_nature">Diere en natuur</characterLabel> + <characterLabel type="arrows">Pyltjies</characterLabel> + <characterLabel type="body">liggaam</characterLabel> + <characterLabel type="box_drawing">Bokstekening</characterLabel> + <characterLabel type="braille">Braille</characterLabel> + <characterLabel type="building">gebou</characterLabel> + <characterLabel type="bullets_stars">Kolpunte/Sterretjies</characterLabel> + <characterLabel type="consonantal_jamo">Konsonantale Jamo</characterLabel> + <characterLabel type="currency_symbols">Geldeenheidsimbole</characterLabel> + <characterLabel type="dash_connector">Koppelteken/Koppelaar</characterLabel> + <characterLabel type="digits">Syfers</characterLabel> + <characterLabel type="dingbats">Dingbats</characterLabel> + <characterLabel type="divination_symbols">Aanwys-simbole</characterLabel> + <characterLabel type="downwards_arrows">Af-pyltjies</characterLabel> + <characterLabel type="downwards_upwards_arrows">Af-op-pyltjies</characterLabel> + <characterLabel type="east_asian_scripts">Oos-Asiese skrifte</characterLabel> + <characterLabel type="emoji">Emoji</characterLabel> + <characterLabel type="european_scripts">Europese skrifte</characterLabel> + <characterLabel type="female">vroulik</characterLabel> + <characterLabel type="flag">vlag</characterLabel> + <characterLabel type="flags">Vlae</characterLabel> + <characterLabel type="food_drink">Kos en drinkgoed</characterLabel> + <characterLabel type="format">Formaat</characterLabel> + <characterLabel type="format_whitespace">Formaat en witspasie</characterLabel> + <characterLabel type="full_width_form_variant">Vollewydte vormvariante</characterLabel> + <characterLabel type="geometric_shapes">Geometriese vorms</characterLabel> + <characterLabel type="half_width_form_variant">Halfwydte vormvariante</characterLabel> + <characterLabel type="han_characters">Han-karakters</characterLabel> + <characterLabel type="han_radicals">Han-radikale</characterLabel> + <characterLabel type="hanja">Hanja</characterLabel> + <characterLabel type="hanzi_simplified">Hanzi (vereenvoudig)</characterLabel> + <characterLabel type="hanzi_traditional">Hanzi (tradisioneel)</characterLabel> + <characterLabel type="heart">hartjie</characterLabel> + <characterLabel type="historic_scripts">Historiese skrifte</characterLabel> + <characterLabel type="ideographic_desc_characters">Ideografies-beskrywende karakters</characterLabel> + <characterLabel type="japanese_kana">Japannese Kana</characterLabel> + <characterLabel type="kanbun">Kanbun</characterLabel> + <characterLabel type="kanji">Kanji</characterLabel> + <characterLabel type="keycap">sleutelbordtoets</characterLabel> + <characterLabel type="leftwards_arrows">Links-pyltjies</characterLabel> + <characterLabel type="leftwards_rightwards_arrows">Links-Regs-pyltjies</characterLabel> + <characterLabel type="letterlike_symbols">Letterige simbole</characterLabel> + <characterLabel type="limited_use">Beperkte gebruik</characterLabel> + <characterLabel type="male">manlik</characterLabel> + <characterLabel type="math_symbols">Wiskunde simbole</characterLabel> + <characterLabel type="middle_eastern_scripts">Midde-Oosterse skrifte</characterLabel> + <characterLabel type="miscellaneous">Allerlei</characterLabel> + <characterLabel type="modern_scripts">Moderne skrifte</characterLabel> + <characterLabel type="modifier">Bepaler</characterLabel> + <characterLabel type="musical_symbols">Musikale simbole</characterLabel> + <characterLabel type="nature">natuur</characterLabel> + <characterLabel type="nonspacing">Niespasiëring</characterLabel> + <characterLabel type="numbers">Nommers</characterLabel> + <characterLabel type="objects">Voorwerpe</characterLabel> + <characterLabel type="other">Ander</characterLabel> + <characterLabel type="paired">Saamgevoeg</characterLabel> + <characterLabel type="person">persoon</characterLabel> + <characterLabel type="phonetic_alphabet">Fonetiese alfabet</characterLabel> + <characterLabel type="pictographs">Piktogram</characterLabel> + <characterLabel type="place">plek</characterLabel> + <characterLabel type="plant">plant</characterLabel> + <characterLabel type="punctuation">Leestekens</characterLabel> + <characterLabel type="rightwards_arrows">Regs-pyltjies</characterLabel> + <characterLabel type="sign_standard_symbols">Teken/Standaard simbool</characterLabel> + <characterLabel type="small_form_variant">Kleinvormvariante</characterLabel> + <characterLabel type="smiley">gesiggie</characterLabel> + <characterLabel type="smileys_people">Emosiekone en mense</characterLabel> + <characterLabel type="south_asian_scripts">Suid-Asiese skrifte</characterLabel> + <characterLabel type="southeast_asian_scripts">Suidoos-Asiese skrifte</characterLabel> + <characterLabel type="spacing">Spasiëring</characterLabel> + <characterLabel type="sport">sport</characterLabel> + <characterLabel type="symbols">Simbole</characterLabel> + <characterLabel type="technical_symbols">Tegniese simbole</characterLabel> + <characterLabel type="tone_marks">Intonasie-klemtekens</characterLabel> + <characterLabel type="travel">reis</characterLabel> + <characterLabel type="travel_places">Reis en plekke</characterLabel> + <characterLabel type="upwards_arrows">Op-pyltjies</characterLabel> + <characterLabel type="variant_forms">Variantvorms</characterLabel> + <characterLabel type="vocalic_jamo">Vokaliese Jamo</characterLabel> + <characterLabel type="weather">weer</characterLabel> + <characterLabel type="western_asian_scripts">Wes-Asiese skrifte</characterLabel> + <characterLabel type="whitespace">Witspasie</characterLabel> + </characterLabels> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_NA.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html --> <ldml> <identity> - <version number="$Revision: 11914 $"/> + <version number="$Revision: 13869 $"/> <language type="af"/> <territory type="NA"/> </identity> @@ -60,4 +61,3 @@ </currencies> </numbers> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/af_ZA.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html --> <ldml> <identity> - <version number="$Revision: 11914 $"/> + <version number="$Revision: 13869 $"/> <language type="af"/> <territory type="ZA"/> </identity> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html --> <ldml> <identity> - <version number="$Revision: 12307 $"/> + <version number="$Revision: 13911 $"/> <language type="agq"/> </identity> <localeDisplayNames> @@ -288,6 +289,7 @@ <exemplarCharacters>[a à â ǎ ā b c d e è ê ě ē ɛ {ɛ\u0300} {ɛ\u0302} {ɛ\u030C} {ɛ\u0304} f g h i ì î ǐ ī ɨ {ɨ\u0300} {ɨ\u0302} {ɨ\u030C} {ɨ\u0304} k l m n ŋ o ò ô ǒ ō ɔ {ɔ\u0300} {ɔ\u0302} {ɔ\u030C} {ɔ\u0304} p s t u ù û ǔ ū ʉ {ʉ\u0300} {ʉ\u0302} {ʉ\u030C} {ʉ\u0304} v w y z ʔ]</exemplarCharacters> <exemplarCharacters type="auxiliary">[q r x]</exemplarCharacters> <exemplarCharacters type="index">[A B C D E Ɛ F G H I Ɨ K L M N Ŋ O Ɔ P S T U Ʉ V W Y Z ʔ]</exemplarCharacters> + <exemplarCharacters type="numbers">[ \- , % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters> </characters> <delimiters> <quotationStart>„</quotationStart> @@ -706,6 +708,9 @@ <displayName>Àlǐalè è Màlàgasì</displayName> </currency> <currency type="MRO"> + <displayName>Ùgueya è Mùlètenyìa (1973–2017)</displayName> + </currency> + <currency type="MRU"> <displayName>Ùgueya è Mùlètenyìa</displayName> </currency> <currency type="MUR"> @@ -745,6 +750,9 @@ <displayName>Shwɨlà è Sùmalìa</displayName> </currency> <currency type="STD"> + <displayName>Dɔbàlà è Sàwu Tɔ̀me à Pèlènsipè (1977–2017)</displayName> + </currency> + <currency type="STN"> <displayName>Dɔbàlà è Sàwu Tɔ̀me à Pèlènsipè</displayName> </currency> <currency type="SZL"> @@ -789,4 +797,3 @@ </messages> </posix> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/agq_CM.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html --> <ldml> <identity> - <version number="$Revision: 11914 $"/> + <version number="$Revision: 13869 $"/> <language type="agq"/> <territory type="CM"/> </identity> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html --> <ldml> <identity> - <version number="$Revision: 12307 $"/> + <version number="$Revision: 13911 $"/> <language type="ak"/> </identity> <localeDisplayNames> @@ -287,6 +288,7 @@ <exemplarCharacters>[a b d e ɛ f g h i k l m n o ɔ p r s t u w y]</exemplarCharacters> <exemplarCharacters type="auxiliary">[c j q v z]</exemplarCharacters> <exemplarCharacters type="index">[A B C D E Ɛ F G H I J K L M N O Ɔ P Q R S T U V W X Y Z]</exemplarCharacters> + <exemplarCharacters type="numbers">[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters> </characters> <delimiters> <quotationStart>“</quotationStart> @@ -678,6 +680,9 @@ <displayName>Madagasi Frank</displayName> </currency> <currency type="MRO"> + <displayName>Mɔretenia Ouguiya (1973–2017)</displayName> + </currency> + <currency type="MRU"> <displayName>Mɔretenia Ouguiya</displayName> </currency> <currency type="MUR"> @@ -720,6 +725,9 @@ <displayName>Somailia Hyelen</displayName> </currency> <currency type="STD"> + <displayName>Sao Tome ne Principe Dobra (1977–2017)</displayName> + </currency> + <currency type="STN"> <displayName>Sao Tome ne Principe Dobra</displayName> </currency> <currency type="SZL"> @@ -753,6 +761,11 @@ <displayName>Zimbabwe Dɔla</displayName> </currency> </currencies> + <minimalPairs> + <pluralMinimalPairs count="one">da {0}</pluralMinimalPairs> + <pluralMinimalPairs count="other">nda {0}</pluralMinimalPairs> + <ordinalMinimalPairs ordinal="other">Fa nyimfa {0}.</ordinalMinimalPairs> + </minimalPairs> </numbers> <posix> <messages> @@ -761,4 +774,3 @@ </messages> </posix> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/ak_GH.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html --> <ldml> <identity> - <version number="$Revision: 11914 $"/> + <version number="$Revision: 13869 $"/> <language type="ak"/> <territory type="GH"/> </identity> </ldml> -
--- a/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml Fri Jun 15 10:48:56 2018 +0530 +++ b/src/jdk.localedata/share/classes/sun/util/cldr/resources/common/main/am.xml Fri Jun 15 11:58:34 2018 +0530 @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd"> -<!-- Copyright © 1991-2015 Unicode, Inc. +<!-- Copyright © 1991-2018 Unicode, Inc. +For terms of use, see http://www.unicode.org/copyright.html +Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the U.S. and other countries. CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/) -For terms of use, see http://www.unicode.org/copyright.html + +Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ for derived annotations. --> <ldml> <identity> - <version number="$Revision: 12293 $"/> + <version number="$Revision: 13911 $"/> <language type="am"/> </identity> <localeDisplayNames> @@ -31,6 +34,7 @@ <language type="akk">አካዲያን</language> <language type="akz">አላባማ</language> <language type="ale">አልዩት</language> + <language type="alt">ደቡባዊ አልታይ</language> <language type="am">አማርኛ</language> <language type="an">አራጎንስ</language> <language type="anp">አንጊካ</language> @@ -72,6 +76,7 @@ <language type="bik">ቢኮል</language> <language type="bin">ቢኒ</language> <language type="bjn">ባንጃር</language> + <language type="bla">ሲክሲካ</language> <language type="bm">ባምባርኛ</language> <language type="bn">ቤንጋሊኛ</language> <language type="bo">ቲቤታንኛ</language> @@ -99,6 +104,7 @@ <language type="chb">ቺብቻ</language> <language type="chg">ቻጋታይ</language> <language type="chk">ቹክስ</language> + <language type="chm">ማሪ</language> <language type="chn">ቺኑክ ጃርጎን</language> <language type="cho">ቾክታዋ</language> <language type="chp">ቺፔውያን</language> @@ -110,6 +116,7 @@ <language type="cps">ካፒዝኖን</language> <language type="cr">ክሪ</language> <language type="crh">ክሪሚያን ተርኪሽ</language> + <language type="crs">ሰሰላዊ ክሬኦሊ ፈረንሳይኛ</language> <language type="cs">ቼክኛ</language> <language type="cu">ቸርች ስላቪክ</language> <language type="cv">ቹቫሽ</language> @@ -138,6 +145,7 @@ <language type="ee">ኢዊ</language> <language type="efi">ኤፊክ</language> <language type="egy">የጥንታዊ ግብጽኛ</language> + <language type="eka">ኤካጁክ</language> <language type="el">ግሪክኛ</language> <language type="en">እንግሊዝኛ</language> <language type="en_AU">የአውስትራሊያ እንግሊዝኛ</language> @@ -154,132 +162,203 @@ <language type="esu">ሴንተራል ዩፒክ</language> <language type="et">ኢስቶኒያንኛ</language> <language type="eu">ባስክኛ</language> + <language type="ewo">ኤዎንዶ</language> <language type="fa">ፐርሺያኛ</language> + <language type="ff">ፉላህ</language> <language type="fi">ፊኒሽ</language> <language type="fil">ፊሊፒንኛ</language> <language type="fj">ፊጂኛ</language> <language type="fo">ፋሮኛ</language> + <language type="fon">ፎን</language> <language type="fr">ፈረንሳይኛ</language> <language type="fr_CA">የካናዳ ፈረንሳይኛ</language> <language type="fr_CH">የስዊዝ ፈረንሳይኛ</language> <language type="frc">ካጁን ፍሬንች</language> <language type="frp">አርፒታን</language> - <language type="fy">የምዕራብ ፍሪስኛ</language> + <language type="fur">ፍሩሊያን</language> + <language type="fy">ምዕራባዊ ፍሪሲኛ</language> <language type="ga">አይሪሽ</language> <language type="gaa">ጋ</language> <language type="gag">ጋጉዝኛ</language> - <language type="gd">እስኮትስ ጌልክኛ</language> + <language type="gan">ጋን ቻይንኛ</language> + <language type="gd">የስኮቲሽ ጌልክኛ</language> <language type="gez">ግዕዝኛ</language> + <language type="gil">ጅልበርትስ</language> <language type="gl">ጋሊሺያ</language> <language type="gn">ጓራኒኛ</language> + <language type="gor">ጎሮንታሎ</language> <language type="grc">የጥንታዊ ግሪክ</language> <language type="gsw">የስዊዝ ጀርመን</language> <language type="gu">ጉጃርቲኛ</language> <language type="guz">ጉስሊኛ</language> <language type="gv">ማንክስኛ</language> + <language type="gwi">ግዊቺን</language> <language type="ha">ሃውሳኛ</language> + <language type="hak">ሃካ ቻይንኛ</language> <language type="haw">ሃዊያኛ</language> - <language type="he">ዕብራስጥ</language> + <language type="he">ዕብራይስጥ</language> <language type="hi">ሒንዱኛ</language> + <language type="hil">ሂሊጋይኖን</language> + <language type="hmn">ህሞንግ</language> <language type="hr">ክሮሽያንኛ</language> <language type="hsb">የላይኛው ሶርቢያንኛ</language> + <language type="hsn">ዢያንግ ቻይንኛ</language> <language type="ht">ሃይትኛ</language> <language type="hu">ሀንጋሪኛ</language> + <language type="hup">ሁፓ</language> <language type="hy">አርመናዊ</language> + <language type="hz">ሄሬሮ</language> <language type="ia">ኢንቴርሊንጓ</language> + <language type="iba">ኢባን</language> + <language type="ibb">ኢቢቦ</language> <language type="id">ኢንዶኔዥኛ</language> <language type="ie">እንተርሊንግወ</language> <language type="ig">ኢግቦኛ</language> <language type="ii">ሲቹንዪኛ</language> <language type="ik">እኑፒያቅኛ</language> + <language type="ilo">ኢሎኮ</language> + <language type="inh">ኢንጉሽ</language> + <language type="io">ኢዶ</language> <language type="is">አይስላንድኛ</language> <language type="it">ጣሊያንኛ</language> <language type="iu">እኑክቲቱትኛ</language> <language type="ja">ጃፓንኛ</language> + <language type="jbo">ሎጅባን</language> <language type="jgo">ንጎባኛ</language> <language type="jmc">ማቻሜኛ</language> <language type="jv">ጃቫንኛ</language> <language type="ka">ጆርጂያን</language> <language type="kab">ካብይል</language> + <language type="kac">ካቺን</language> + <language type="kaj">ካጅ</language> <language type="kam">ካምባ</language> + <language type="kbd">ካባርዲያን</language> + <language type="kcg">ታያፕ</language> <language type="kde">ማኮንዴ</language> <language type="kea">ካቡቨርዲያኑ</language> + <language type="kfo">ኮሮ</language> <language type="kg">ኮንጎኛ</language> + <language type="kha">ክሃሲ</language> <language type="khq">ኮይራ ቺኒ</language> <language type="ki">ኪኩዩ</language> + <language type="kj">ኩንያማ</language> <language type="kk">ካዛክኛ</language> + <language type="kkj">ካኮ</language> <language type="kl">ካላሊሱትኛ</language> <language type="kln">ካለንጂን</language> - <language type="km">ክመርኛ ማእከላዊ</language> + <language type="km">ክህመርኛ</language> + <language type="kmb">ኪምቡንዱ</language> <language type="kn">ካናዳኛ</language> <language type="ko">ኮሪያኛ</language> <language type="koi">ኮሚ ፔርምያክ</language> - <language type="kok">ኮካኒ</language> + <language type="kok">ኮንካኒ</language> + <language type="kpe">ክፔሌ</language> + <language type="kr">ካኑሪ</language> + <language type="krc">ካራቻይ-ባልካር</language> + <language type="krl">ካረሊኛ</language> + <language type="kru">ኩሩክ</language> <language type="ks">ካሽሚርኛ</language> <language type="ksb">ሻምባላ</language> <language type="ksf">ባፊያ</language> <language type="ksh">ኮሎኝያን</language> <language type="ku">ኩርድሽኛ</language> + <language type="kum">ኩማይክ</language> + <language type="kv">ኮሚ</language> <language type="kw">ኮርኒሽ</language> <language type="ky">ኪርጊዝኛ</language> <language type="la">ላቲንኛ</language> + <language type="lad">ላዲኖ</language> <language type="lag">ላንጊ</language> - <language type="lb">ሉክዘምበርገርኛ</language> + <language type="lb">ሉክዘምበርኛ</language> + <language type="lez">ሌዝጊያን</language> <language type="lg">ጋንዳኛ</language> + <language type="li">ሊምቡርጊሽ</language> <language type="lkt">ላኮታ</language> <language type="ln">ሊንጋላኛ</language> - <language type="lo">ላውስኛ</language> + <language type="lo">ላኦኛ</language> <language type="loz">ሎዚኛ</language> <language type="lrc">ሰሜናዊ ሉሪ</language> <language type="lt">ሉቴንያንኛ</language> <language type="lu">ሉባ ካታንጋ</language> <language type="lua">ሉባ-ሉሏ</language> + <language type="lun">ሉንዳ</language> <language type="luo">ሉኦ</language> + <language type="lus">ሚዞ</language> <language type="luy">ሉዪያ</language> <language type="lv">ላትቪያን</language> + <language type="mad">ማዱረስ</language> + <language type="mag">ማጋሂ</language> + <language type="mai">ማይተሊ</language> + <language type="mak">ማካሳር</language> <language type="mas">ማሳይ</language> + <language type="mdf">ሞክሻ</language> + <language type="men">ሜንዴ</language> <language type="mer">ሜሩ</language> <language type="mfe">ሞሪሲየኛ</language> <language type="mg">ማላጋስኛ</language> <language type="mgh">ማኩዋ ሜቶ</language> <language type="mgo">ሜታ</language> - <language type="mi">ማዮሪኛ</language> + <language type="mh">ማርሻሌዝኛ</language> + <language type="mi">ማኦሪኛ</language> + <language type="mic">ሚክማክ</language> + <language type="min">ሚናንግካባኡ</language> <language type="mk">ማሴዶንኛ</language> <language type="ml">ማላያላምኛ</language> <language type="mn">ሞንጎላዊኛ</language> + <language type="mni">ማኒፑሪ</language> <language type="moh">ሞሃውክ</language> + <language type="mos">ሞሲ</language> <language type="mr">ማራቲኛ</language> <language type="ms">ማላይኛ</language> <language type="mt">ማልቲስኛ</language> <language type="mua">ሙንዳንግ</language> + <language type="mul">ባለብዙ ቋንቋዎች</language> <language type="mus">ክሪክ</language> + <language type="mwl">ሚራንዴዝኛ</language> <language type="my">ቡርማኛ</language> + <language type="myv">ኤርዝያ</language> <language type="mzn">ማዛንደራኒ</language> <language type="na">ናኡሩ</language> + <language type="nan">ሚን ኛን ቻይንኛ</language> + <language type="nap">ኒአፖሊታን</language> <language type="naq">ናማ</language> <language type="nb">የኖርዌይ ቦክማል</language> <language type="nd">ሰሜን ንዴብሌ</language> <language type="nds">የታችኛው ጀርመን</language> <language type="nds_NL">የታችኛው ሳክሰን</language> <language type="ne">ኔፓሊኛ</language> + <language type="new">ነዋሪ</language> + <language type="ng">ንዶንጋ</language> + <language type="nia">ኒአስ</language> + <language type="niu">ኒዩአንኛ</language> <language type="njo">ኦ ናጋ</language> <language type="nl">ደች</language> <language type="nl_BE">ፍሌሚሽ</language> <language type="nmg">ክዋሲዮ</language> <language type="nn">የኖርዌይ ናይኖርስክ</language> + <language type="nnh">ኒጊምቡን</language> <language type="no">ኖርዌጂያን</language> + <language type="nog">ኖጋይ</language> <language type="nqo">ንኮ</language> + <language type="nr">ደቡብ ንደቤሌ</language> <language type="nso">ሰሜናዊ ሶቶ</language> <language type="nus">ኑዌር</language> + <language type="nv">ናቫጆ</language> <language type="nwc">ክላሲክ ኔዋሪ</language> <language type="ny">ንያንጃ</language> <language type="nyn">ኒያንኮልኛ</language> <language type="oc">ኦኪታንኛ</language> <language type="om">ኦሮሞኛ</language> - <language type="or">ኦሪያኛ</language> + <language type="or">ኦዲያኛ</language> <language type="os">ኦሴቲክ</language> <language type="pa">ፑንጃብኛ</language> + <language type="pag">ፓንጋሲናንኛ</language> + <language type="pam">ፓምፓንጋ</language> + <language type="pap">ፓፒአሜንቶ</language> + <language type="pau">ፓላኡአን</language> + <language type="pcm">የናይጄሪያ ፒጂን</language> <language type="pl">ፖሊሽኛ</language> + <language type="prg">ፐሩሳንኛ</language> <language type="ps">ፓሽቶኛ</language> <language type="ps" alt="variant">ፑሽቶ</language> <language type="pt">ፖርቹጋልኛ</language> @@ -288,26 +367,37 @@ <language type="qu">ኵቿኛ</language> <language type="quc">ኪቼ</language> <language type="qug">ቺምቦራዞ ሃይላንድ ኩቹዋ</language> + <language type="rap">ራፓኑኢ</language> + <language type="rar">ራሮቶንጋ</language> <language type="rm">ሮማንሽ</language> <language type="rn">ሩንዲኛ</language> <language type="ro">ሮማኒያን</language> - <language type="ro_MD">ሞልዳቫዊና</language> + <language type="ro_MD">ሞልዳቪያንኛ</language> <language type="rof">ሮምቦ</language> + <language type="root">ሩት</language> <language type="ru">ራሽያኛ</language> <language type="rup">አሮማንያን</language> <language type="rw">ኪንያርዋንድኛ</language> <language type="rwk">ርዋ</language> <language type="sa">ሳንስክሪትኛ</language> + <language type="sad">ሳንዳዌ</language> + <language type="sah">ሳክሃ</language> <language type="saq">ሳምቡሩ</language> + <language type="sat">ሳንታሊ</language> + <language type="sba">ንጋምባይ</language> <language type="sbp">ሳንጉ</language> + <language type="sc">ሳርዲንያንኛ</language> + <language type="scn">ሲሲሊያንኛ</language> + <language type="sco">ስኮትስ</language> <language type="sd">ሲንድሂኛ</language> - <language type="sdh">ደቡባዊ ኩዲሽ</language> + <language type="sdh">ደቡባዊ ኩርዲሽ</language> <language type="se">ሰሜናዊ ሳሚ</language> <language type="seh">ሴና</language> <language type="ses">ኮይራቦሮ ሴኒ</language> <language type="sg">ሳንጎኛ</language> - <language type="sh" draft="unconfirmed">ሰርቦ-ክሮኤሽያኛ</language> + <language type="sh">ሰርቦ-ክሮኤሽያኛ</language> <language type="shi">ታቼልሂት</language> + <language type="shn">ሻን</language> <language type="shu">ቻዲያን ዓረብኛ</language> <language type="si">ሲንሃልኛ</language> <language type="sid">ሲዳምኛ</language> @@ -319,54 +409,73 @@ <language type="smn">ኢናሪ ሳሚ</language> <language type="sms">ስኮልት ሳሚ</language> <language type="sn">ሾናኛ</language> + <language type="snk">ሶኒንኬ</language> <language type="so">ሱማልኛ</language> - <language type="sq">ልቤኒኛ</language> + <language type="sq">አልባንያንኛ</language> <language type="sr">ሰርቢኛ</language> + <language type="srn">ስራናን ቶንጎ</language> <language type="ss">ስዋቲኛ</language> - <language type="st">ሶዞኛ</language> + <language type="ssy">ሳሆኛ</language> + <language type="st">ደቡባዊ ሶቶ</language> <language type="su">ሱዳንኛ</language> + <language type="suk">ሱኩማ</language> <language type="sv">ስዊድንኛ</language> <language type="sw">ስዋሂሊኛ</language> <language type="sw_CD">ኮንጎ ስዋሂሊ</language> <language type="swb">ኮሞሪያን</language> <language type="syc">ክላሲክ ኔይራ</language> + <language type="syr">ሲሪያክ</language> <language type="ta">ታሚልኛ</language> <language type="te">ተሉጉኛ</language> + <language type="tem">ቲምኔ</language> <language type="teo">ቴሶ</language> <language type="tet">ቴተም</language> <language type="tg">ታጂኪኛ</language> <language type="th">ታይኛ</language> <language type="ti">ትግርኛ</language> <language type="tig">ትግረ</language> - <language type="tk">ቱርክመንኛ</language> + <language type="tk">ቱርክሜንኛ</language> <language type="tl">ታጋሎገኛ</language> <language type="tlh">ክሊንጎንኛ</language> <language type="tn">ጽዋናዊኛ</language> <language type="to">ቶንጋኛ</language> <language type="tpi">ቶክ ፒሲን</language> <language type="tr">ቱርክኛ</language> + <language type="trv">ታሮኮ</language> <language type="ts">ጾንጋኛ</language> <language type="tt">ታታርኛ</language> <language type="tum">ቱምቡካ</language> + <language type="tvl">ቱቫሉ</language> <language type="tw">ትዊኛ</language> <language type="twq">ታሳዋቅ</language> <language type="ty">ታሂታንኛ</language> + <language type="tyv">ቱቪንያንኛ</language> <language type="tzm">መካከለኛ አትላስ ታማዚግት</language> + <language type="udm">ኡድሙርት</language> <language type="ug">ኡዊግሁርኛ</language> <language type="ug" alt="variant">ኡይገር</language> <language type="uk">ዩክሬንኛ</language> + <language type="umb">ኡምቡንዱ</language> <language type="und">ያልታወቀ ቋንቋ</language> <language type="ur">ኡርዱኛ</language> <language type="uz">ኡዝቤክኛ</language> <language type="vai">ቫይ</language> <language type="ve">ቬንዳ</language> - <language type="vi">ቪትናምኛ</language> + <language type="vi">ቪየትናምኛ</language> <language type="vo">ቮላፑክኛ</language> <language type="vun">ቩንጆ</language> + <language type="wa">ዋሎን</language> + <language type="wae">ዋልሰር</language> + <language type="wal">ወላይትኛ</language> + <language type="war">ዋራይ</language> <language type="wbp">ዋርልፒሪ</language> <language type="wo">ዎሎፍኛ</language> + <language type="wuu">ዉ ቻይንኛ</language> + <language type="xal">ካልማይክ</language> <language type="xh">ዞሳኛ</language> <language type="xog">ሶጋ</language> + <language type="yav">ያንግቤንኛ</language> + <language type="ybb">የምባ</language> <language type="yi">ይዲሽኛ</language> <language type="yo">ዮሩባዊኛ</language> <language type="yue">ካንቶኒዝ</language> @@ -377,7 +486,9 @@ <language type="zh_Hans">ቀለል ያለ ቻይንኛ</language> <language type="zh_Hant">ባህላዊ ቻይንኛ</language> <language type="zu">ዙሉኛ</language> + <language type="zun">ዙኒ</language> <language type="zxx">ቋንቋዊ ይዘት አይደለም</language> + <language type="zza">ዛዛ</language> </languages> <scripts> <script type="Arab">ዓረብኛ</script> @@ -400,6 +511,7 @@ <script type="Grek">ግሪክ</script> <script type="Gujr">ጉጃራቲ</script> <script type="Guru">ጉርሙኪ</script> + <script type="Hanb">ሃንብ</script> <script type="Hang">ሐንጉል</script> <script type="Hani">ሃን</script> <script type="Hano" draft="unconfirmed">ሀኑኦ</script> @@ -409,7 +521,8 @@ <script type="Hant" alt="stand-alone">ባህላዊ ሃን</script> <script type="Hebr">እብራይስጥ</script> <script type="Hira">ሂራጋና</script> - <script type="Hrkt" draft="unconfirmed">ካታካና ወይንም ሂራጋና</script> + <script type="Hrkt">ካታካና ወይንም ሂራጋና</script> + <script type="Jamo">ጃሞ</script> <script type="Jpan">ጃፓንኛ</script> <script type="Kana">ካታካና</script> <script type="Khmr">ክህመር</script> @@ -443,6 +556,8 @@ <script type="Vaii" draft="unconfirmed">ቫይ</script> <script type="Yiii" draft="unconfirmed">ዪ</script> <script type="Zinh" draft="unconfirmed">የተወረሰ</script> + <script type="Zmth">Zmth</script> + <script type="Zsye">Zsye</script> <script type="Zsym">ምልክቶች</script> <script type="Zxxx">ያልተጻፈ</script> <script type="Zyyy">የጋራ</script> @@ -478,13 +593,14 @@ <territory type="151">ምዕራባዊ አውሮፓ</territory> <territory type="154">ሰሜናዊ አውሮፓ</territory> <territory type="155">ምስራቃዊ አውሮፓ</territory> + <territory type="202">ከሰሃራ በታች አፍሪካ</territory> <territory type="419">ላቲን አሜሪካ</territory> <territory type="AC">አሴንሽን ደሴት</territory> <territory type="AD">አንዶራ</territory> - <territory type="AE">የተባበሩት አረብ ኤምሬትስ</territory> + <territory type="AE">የተባበሩት ዓረብ ኤምሬትስ</territory> <territory type="AF">አፍጋኒስታን</territory> <territory type="AG">አንቲጓ እና ባሩዳ</territory> - <territory type="AI">አንጉኢላ</territory> + <territory type="AI">አንጉይላ</territory> <territory type="AL">አልባኒያ</territory> <territory type="AM">አርሜኒያ</territory> <territory type="AO">አንጐላ</territory> @@ -516,7 +632,7 @@ <territory type="BV">ቡቬት ደሴት</territory> <territory type="BW">ቦትስዋና</territory> <territory type="BY">ቤላሩስ</territory> - <territory type="BZ">ቤሊዘ</territory> + <territory type="BZ">በሊዝ</territory> <territory type="CA">ካናዳ</territory> <territory type="CC">ኮኮስ(ኬሊንግ) ደሴቶች</territory> <territory type="CD">ኮንጎ-ኪንሻሳ</territory> @@ -533,19 +649,20 @@ <territory type="CN">ቻይና</territory> <territory type="CO">ኮሎምቢያ</territory> <territory type="CP">ክሊፐርቶን ደሴት</territory> - <territory type="CR">ኮስታ ሪካ</territory> + <territory type="CR">ኮስታሪካ</territory> <territory type="CU">ኩባ</territory> <territory type="CV">ኬፕ ቬርዴ</territory> <territory type="CW">ኩራሳዎ</territory> <territory type="CX">የገና ደሴት</territory> <territory type="CY">ሳይፕረስ</territory> - <territory type="CZ">ቼክ ሪፑብሊክ</territory> + <territory type="CZ">ቼችኒያ</territory> + <territory type="CZ" alt="variant">ቼክ ሪፑብሊክ</territory> <territory type="DE">ጀርመን</territory> <territory type="DG">ዲዬጎ ጋርሺያ</territory> <territory type="DJ">ጂቡቲ</territory> <territory type="DK">ዴንማርክ</territory> <territory type="DM">ዶሚኒካ</territory> - <territory type="DO">ዶሚኒክ ሪፑብሊክ</territory> + <territory type="DO">ዶመኒካን ሪፑብሊክ</territory> <territory type="DZ">አልጄሪያ</territory> <territory type="EA">ሴኡታና ሜሊላ</territory> <territory type="EC">ኢኳዶር</territory> @@ -556,6 +673,7 @@ <territory type="ES">ስፔን</territory> <territory type="ET">ኢትዮጵያ</territory> <territory type="EU">የአውሮፓ ህብረት</territory> + <territory type="EZ">የአውሮፓ ዞን</territory> <territory type="FI">ፊንላንድ</territory> <territory type="FJ">ፊጂ</territory> <territory type="FK">የፎክላንድ ደሴቶች</territory> @@ -564,7 +682,7 @@ <territory type="FO">የፋሮ ደሴቶች</territory> <territory type="FR">ፈረንሳይ</territory> <territory type="GA">ጋቦን</territory> - <territory type="GB">እንግሊዝ</territory> + <territory type="GB">ዩናይትድ ኪንግደም</territory> <territory type="GB" alt="short">ዩናይትድ ኪንግደም</territory> <territory type="GD">ግሬናዳ</territory> <territory type="GE">ጆርጂያ</territory> @@ -583,7 +701,7 @@ <territory type="GU">ጉዋም</territory> <territory type="GW">ጊኒ ቢሳኦ</territory> <territory type="GY">ጉያና</territory> - <territory type="HK">ሆንግ ኮንግ SAR ቻይና</territory> + <territory type="HK">ሆንግ ኮንግ ልዩ የአስተዳደር ክልል ቻይና</territory> <territory type="HK" alt="short">ሆንግ ኮንግ</territory> <territory type="HM">ኽርድ ደሴቶችና ማክዶናልድ ደሴቶች</territory> <territory type="HN">ሆንዱራስ</territory> @@ -685,7 +803,7 @@ <territory type="RE">ሪዩኒየን</territory> <territory type="RO">ሮሜኒያ</territory> <territory type="RS">ሰርብያ</territory> - <territory type="RU">ራሽያ</territory> + <territory type="RU">ሩስያ</territory> <territory type="RW">ሩዋንዳ</territory> <territory type="SA">ሳውድአረቢያ</territory> <territory type="SB">ሰሎሞን ደሴት</territory> @@ -729,6 +847,8 @@ <territory type="UA">ዩክሬን</territory> <territory type="UG">ዩጋንዳ</territory> <territory type="UM">የዩ ኤስ ጠረፍ ላይ ያሉ ደሴቶች</territory> + <territory type="UN">የተባበሩት መንግስታት</territory> + <territory type="UN" alt="short">የተመ</territory> <territory type="US">ዩናይትድ ስቴትስ</territory> <territory type="US" alt="short">ዩ ኤስ</territory> <territory type="UY">ኡራጓይ</territory> @@ -752,23 +872,22 @@ </territories> <keys> <key type="calendar">የቀን አቆጣጠር</key> + <key type="cf">የምንዛሪ ቅርጸት</key> <key type="colAlternate">የምልክቶች ድርደራ ችላ በለው</key> <key type="colBackwards">የኋሊዮሽ የፊደል ጭረት ድርደራ</key> <key type="colCaseFirst">የአቢይ/ንዑስ ሆሄ ቅደም ተከተል</key> <key type="colCaseLevel">የመልከፊደል ትብ ድርደራ</key> - <key type="colHiraganaQuaternary">የካና ድርደራ</key> <key type="collation">አቀማመጥ ደርድር</key> <key type="colNormalization">መደበኛ ድርደራ</key> <key type="colNumeric">የቁጥር ድርደራ</key> <key type="colStrength">የድርደራ አቅም</key> - <key type="currency">ገንዘብ</key> + <key type="currency">ምንዛሪ</key> <key type="hc">የሰዓት ዑደት (12 ወይም 24)</key> <key type="lb">መስመር መስበሪያ ቅጥ</key> <key type="ms">የመለኪያ ስርዓት</key> <key type="numbers">ቁጥሮች</key> <key type="timezone">የሰዓት ሰቅ</key> <key type="va">የአካባቢ አይነት</key> - <key type="variableTop">እንደምልክቶች ደርድር</key> <key type="x">ለግል ጥቅም</key> </keys> <types> @@ -787,6 +906,8 @@ <type key="calendar" type="japanese">የጃፓን የቀን አቆጣጠር</type> <type key="calendar" type="persian">የፐርሽያ የቀን አቆጣጠር</type> <type key="calendar" type="roc">የሚንጉ የቀን አቆጣጠር</type> + <type key="cf" type="account">የሂሳብ ምንዛሪ ቅርጸት</type> + <type key="cf" type="standard">መደበኛ የምንዛሪ ቅርጸት</type> <type key="colAlternate" type="non-ignorable">ምልክቶችን ደርድር</type> <type key="colAlternate" type="shifted">ችላ ባይ ምልክቶችን ደርድር</type> <type key="colBackwards" type="no">የፊደል ጭረቶችን እንደመደበኛ ደርድር</type> @@ -796,8 +917,6 @@ <type key="colCaseFirst" type="upper">አቢይ ሆሄ መጀመሪያ ደርድር</type> <type key="colCaseLevel" type="no">ያለመልከፊደል ትብ ደርድር</type> <type key="colCaseLevel" type="yes">በመልከፊደል ትብ ደርድር</type> - <type key="colHiraganaQuaternary" type="no">ካና ለይተህ ደርድር</type> - <type key="colHiraganaQuaternary" type="yes">ካና ለይተህ ደርድር</type> <type key="collation" type="big5han">የባህላዊ ቻይንኛ የድርድር ቅደም ተከተል - ትልቅ5</type> <type key="collation" type="dictionary">የመዝገበ ቃላት የድርድር ቅደም ተከተል</type> <type key="collation" type="ducet">የነባሪ ዩኒኮድ የድርድር ቅደም ተከተል</type> @@ -821,6 +940,9 @@ <type key="colStrength" type="quaternary">የፊደል ጭረቶች/መልከፊደል/ስፋት/ካና ደርድር</type> <type key="colStrength" type="secondary">የፊደል ጭረቶችን ደርድር</type> <type key="colStrength" type="tertiary">የፊደል ጭረቶች/መልከፊደል/ስፋት ደርድር</type> + <type key="d0" type="fwidth">ሙሉ ወርድ</type> + <type key="d0" type="hwidth">ሃልፍዊድዝ</type> + <type key="d0" type="npinyin">አሃዛዊ</type> <type key="hc" type="h11">የ12 ሰዓት ስርዓት (0–11)</type> <type key="hc" type="h12">የ12 ሰዓት ስርዓት (1–12)</type> <type key="hc" type="h23">የ24 ሰዓት ስርዓት (0–23)</type> @@ -828,6 +950,8 @@ <type key="lb" type="loose">ላላ ያለ መስመር መስበሪያ ቅጥ</type> <type key="lb" type="normal">መደበኛ መስመር መስበሪያ ቅጥ</type> <type key="lb" type="strict">ጠበቅ ያለ መስመር መስበሪያ ቅጥ</type> + <type key="m0" type="bgn">ቢ ጂ ኤን</type> + <type key="m0" type="ungegn">UNGEGN</type> <type key="ms" type="metric">የልኬት ስርዓት</type> <type key="ms" type="uksystem">ኢምፔሪያል የመለኪያ ስርዓት</type> <type key="ms" type="ussystem">የአሜሪካ መለኪያ ስርዓት</type> @@ -872,18 +996,6 @@ <type key="numbers" type="traditional">ተለምዷዊ ቁጥሮች</type> <type key="numbers" type="vaii">የቫይ አሃዞች</type> </types> - <transformNames> - <transformName type="BGN">ቢ ጂ ኤን</transformName> - <transformName type="Numeric">አሃዛዊ</transformName> - <transformName type="Tone">የድምፅ ቃና</transformName> - <transformName type="UNGEGN">UNGEGN</transformName> - <transformName type="x-Accents">ትእምርት</transformName> - <transformName type="x-Fullwidth">ሙሉ ወርድ</transformName> - <transformName type="x-Halfwidth">ሃልፍዊድዝ</transformName> - <transformName type="x-Jamo">ጃሞ</transformName> - <transformName type="x-Pinyin">ፒንዪን</transformName> - <transformName type="x-Publishing">ማሳተም</transformName> - </transformNames> <measurementSystemNames> <measurementSystemName type="metric">ሜትሪክ</measurementSystemName> <measurementSystemName type="UK">ዩኬ</measurementSystemName> @@ -899,6 +1011,7 @@ <exemplarCharacters>[ሀ ሁ ሂ ሃ ሄ ህ ሆ ለ ሉ ሊ ላ ሌ ል ሎ ሏ ሐ ሑ ሒ ሓ ሔ ሕ ሖ ሗ መ ሙ ሚ ማ ሜ ም ሞ ሟ ሠ ሡ ሢ ሣ ሤ ሥ ሦ ሧ ረ ሩ ሪ ራ ሬ ር ሮ ሯ ሰ ሱ ሲ ሳ ሴ ስ ሶ ሷ ሸ ሹ ሺ ሻ ሼ ሽ ሾ ሿ ቀ ቁ ቂ ቃ ቄ ቅ ቆ ቈ ቊ ቋ ቌ ቍ በ ቡ ቢ ባ ቤ ብ ቦ ቧ ቨ ቩ ቪ ቫ ቬ ቭ ቮ ቯ ተ ቱ ቲ ታ ቴ ት ቶ ቷ ቸ ቹ ቺ ቻ ቼ ች ቾ ቿ ኀ ኁ ኂ ኃ ኄ ኅ ኆ ኈ ኊ ኋ ኌ ኍ ነ ኑ ኒ ና ኔ ን ኖ ኗ ኘ ኙ ኚ ኛ ኜ ኝ ኞ ኟ አ ኡ ኢ ኣ ኤ እ ኦ ኧ ከ ኩ ኪ ካ ኬ ክ ኮ ኰ ኲ ኳ ኴ ኵ ኸ ኹ ኺ ኻ ኼ ኽ ኾ ወ ዉ ዊ ዋ ዌ ው ዎ ዐ ዑ ዒ ዓ ዔ ዕ ዖ ዘ ዙ ዚ ዛ ዜ ዝ ዞ ዟ ዠ ዡ ዢ ዣ ዤ ዥ ዦ ዧ የ ዩ ዪ ያ ዬ ይ ዮ ደ ዱ ዲ ዳ ዴ ድ ዶ ዷ ጀ ጁ ጂ ጃ ጄ ጅ ጆ ጇ ገ ጉ ጊ ጋ ጌ ግ ጎ ጐ ጒ ጓ ጔ ጕ ጠ ጡ ጢ ጣ ጤ ጥ ጦ ጧ ጨ ጩ ጪ ጫ ጬ ጭ ጮ ጯ ጰ ጱ ጲ ጳ ጴ ጵ ጶ ጷ ጸ ጹ ጺ ጻ ጼ ጽ ጾ ጿ ፀ ፁ ፂ ፃ ፄ ፅ ፆ ፈ ፉ ፊ ፋ ፌ ፍ ፎ ፏ ፐ ፑ ፒ ፓ ፔ ፕ ፖ ፗ]</exemplarCharacters> <exemplarCharacters type="auxiliary">[]</exemplarCharacters> <exemplarCharacters type="index" draft="unconfirmed">[ሀ ለ ሐ መ ሠ ረ ሰ ሸ ቀ ቈ በ ቨ ተ ቸ ኀ ኈ ነ ኘ አ ከ ኰ ኸ ወ ዐ ዘ ዠ የ ደ ጀ ገ ጐ ጠ ጨ ጰ ጸ ፀ ፈ ፐ]</exemplarCharacters> + <exemplarCharacters type="numbers">[\- , . % ‰ + 0 1 2 3 4 5 6 7 8 9]</exemplarCharacters> <exemplarCharacters type="punctuation">[‐ – , ፡ ፣ ፤ ፥ ፦ ! ? . ። ‹ › « » ( ) \[ \]]</exemplarCharacters> <ellipsis type="final">{0}…</ellipsis> <ellipsis type="initial">…{0}</ellipsis> @@ -907,6 +1020,25 @@ <ellipsis type="word-initial">… {0}</ellipsis> <ellipsis type="word-medial">{0} … {1}</ellipsis> <moreInformation>?</moreInformation> + <parseLenients scope="date" level="lenient"> + <parseLenient sample="-" draft="contributed">[\--/]</parseLenient> + <parseLenient sample=":" draft="contributed">[\:∶]</parseLenient> + </parseLenients> + <parseLenients scope="general" level="lenient"> + <parseLenient sample="." draft="contributed">[.․。︒﹒．｡]</parseLenient> + <parseLenient sample="$" draft="contributed">[\$﹩＄$]</parseLenient> + <parseLenient sample="£" draft="contributed">[£₤]</parseLenient> + <parseLenient sample="₹" draft="contributed">[₨₹{Rp}{Rs}]</parseLenient> + </parseLenients> + <parseLenients scope="number" level="lenient"> + <parseLenient sample="-" draft="contributed">[\-‒⁻₋−➖﹣－]</parseLenient> + <parseLenient sample="," draft="contributed">[,،٫、︐︑﹐﹑，､]</parseLenient> + <parseLenient sample="+" draft="contributed">[+⁺₊➕﬩﹢＋]</parseLenient> + </parseLenients> + <parseLenients scope="number" level="stricter"> + <parseLenient sample="," draft="contributed">[,٫︐﹐，]</parseLenient> + <parseLenient sample="." draft="contributed">[.․﹒．｡]</parseLenient> + </parseLenients> </characters> <delimiters> <quotationStart>«</quotationStart> @@ -1444,9 +1576,18 @@ </dateTimeFormat> </dateTimeFormatLength> <availableFormats> + <dateFormatItem id="Bh">h B</dateFormatItem> + <dateFormatItem id="Bhm">h:mm B</dateFormatItem> + <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem> <dateFormatItem id="d">d</dateFormatItem> <dateFormatItem id="E">ccc</dateFormatItem> + <dateFormatItem id="EBhm">E h:mm B</dateFormatItem> + <dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem> <dateFormatItem id="Ed">E d</dateFormatItem> + <dateFormatItem id="Ehm">E h:mm a</dateFormatItem> + <dateFormatItem id="EHm">E HH:mm</dateFormatItem> + <dateFormatItem id="Ehms">E h:mm:ss a</dateFormatItem> + <dateFormatItem id="EHms">E HH:mm:ss</dateFormatItem> <dateFormatItem id="Gy">y G</dateFormatItem> <dateFormatItem id="GyMMM">MMM፣ y G</dateFormatItem> <dateFormatItem id="GyMMMd">MMM d፣ y G</dateFormatItem> @@ -1864,14 +2005,14 @@ <eras> <eraNames> <era type="0">ዓመተ ዓለም</era> - <era type="0" alt="variant">BCE</era> + <era type="0" alt="variant">ዓ/ዓ</era> <era type="1">ዓመተ ምሕረት</era> <era type="1" alt="variant">ዓ/ም</era> </eraNames> <eraAbbr> <era type="0">ዓ/ዓ</era> - <era type="0" alt="variant">BCE</era> <era type="1">ዓ/ም</era> + <era type="1" alt="variant">CE</era> </eraAbbr> <eraNarrow> <era type="0">ዓ/ዓ</era> @@ -1944,8 +2085,13 @@ </dateTimeFormat> </dateTimeFormatLength> <availableFormats> + <dateFormatItem id="Bh">h B</dateFormatItem> + <dateFormatItem id="Bhm">h:mm B</dateFormatItem> + <dateFormatItem id="Bhms">h:mm:ss B</dateFormatItem> <dateFormatItem id="d">d</dateFormatItem> <dateFormatItem id="E">ccc</dateFormatItem> + <dateFormatItem id="EBhm">E h:mm B</dateFormatItem> + <dateFormatItem id="EBhms">E h:mm:ss B</dateFormatItem> <dateFormatItem id="Ed">E d</dateFormatItem> <dateFormatItem id="Ehm">E h:mm a</dateFormatItem> <dateFormatItem id="EHm">E HH:mm</dateFormatItem> @@ -1973,6 +2119,8 @@ <dateFormatItem id="MMMEd">E፣ MMM d</dateFormatItem> <dateFormatItem id="MMMMd">MMMM d</dateFormatItem> <dateFormatItem id="MMMMEd">E፣ MMMM d</dateFormatItem> + <dateFormatItem id="MMMMW" count="one">'week' W 'of' MMM</dateFormatItem> + <dateFormatItem id="MMMMW" count="other">'week' W 'of' MMM</dateFormatItem> <dateFormatItem id="ms">mm:ss</dateFormatItem> <dateFormatItem id="y">y</dateFormatItem> <dateFormatItem id="yM">M/y</dateFormatItem> @@ -1984,6 +2132,8 @@ <dateFormatItem id="yMMMM">MMMM y</dateFormatItem> <dateFormatItem id="yQQQ">QQQ y</dateFormatItem> <dateFormatItem id="yQQQQ">QQQQ y</dateFormatItem> + <dateFormatItem id="yw" count="one">'week' w 'of' Y</dateFormatItem> + <dateFormatItem id="yw" count="other">'week' w 'of' Y</dateFormatItem> </availableFormats> <appendItems> <appendItem request="Timezone">{0} {1}</appendItem> @@ -2110,6 +2260,12 @@ <field type="era"> <displayName>ዘመን</displayName> </field> + <field type="era-short"> + <displayName>ዘመን</displayName> + </field> + <field type="era-narrow"> + <displayName>ዘመን</displayName> + </field> <field type="year"> <displayName>ዓመት</displayName> <relative type="-1">ያለፈው ዓመት</relative> @@ -2249,6 +2405,7 @@ <relativeTimePattern count="one">ከ{0} ሳምንት በፊት</relativeTimePattern> <relativeTimePattern count="other">ከ{0} ሳምንታት በፊት</relativeTimePattern> </relativeTime> + <relativePeriod>{0} ሳምንት</relativePeriod> </field> <field type="week-short"> <displayName>ሳምንት</displayName> @@ -2263,6 +2420,7 @@ <relativeTimePattern count="one">ከ{0} ሳምንታት በፊት</relativeTimePattern> <relativeTimePattern count="other">ከ{0} ሳምንታት በፊት</relativeTimePattern> </relativeTime> + <relativePeriod>{0} ሳምንት</relativePeriod> </field> <field type="week-narrow"> <displayName>ሳምንት</displayName> @@ -2277,6 +2435,16 @@ <relativeTimePattern count="one">ከ{0} ሳምንታት በፊት</relativeTimePattern> <relativeTimePattern count="other">ከ{0} ሳምንታት በፊት</relativeTimePattern> </relativeTime> + <relativePeriod>{0} ሳምንት</relativePeriod> + </field> + <field type="weekOfMonth"> + <displayName>የወሩ ሳምንት</displayName> + </field> + <field type="weekOfMonth-short"> + <displayName>የወሩ ሳምንት</displayName> + </field> + <field type="weekOfMonth-narrow"> + <displayName>የወሩ ሳምንት</displayName> </field> <field type="day"> <displayName>ቀን</displayName> @@ -2326,119 +2494,318 @@ <relativeTimePattern count="other">ከ{0} ቀኖች በፊት</relativeTimePattern> </relativeTime> </field> + <field type="dayOfYear"> + <displayName>የዓመቱ ቀን</displayName> + </field> + <field type="dayOfYear-short"> + <displayName>የዓመቱ ቀን</displayName> + </field> + <field type="dayOfYear-narrow"> + <displayName>የዓመቱ ቀን</displayName> + </field> <field type="weekday"> <displayName>አዘቦት</displayName> </field> + <field type="weekday-short"> + <displayName>አዘቦት</displayName> + </field> + <field type="weekday-narrow"> + <displayName>አዘቦት</displayName> + </field> + <field type="weekdayOfMonth"> + <displayName>የወሩ የሳምንት ቀን</displayName> + </field> + <field type="weekdayOfMonth-short"> + <displayName>የወሩ የሳምንት ቀን</displayName> + </field> + <field type="weekdayOfMonth-narrow"> + <displayName>የወሩ የሳምንት ቀን</displayName> + </field> <field type="sun"> <relative type="-1">ያለፈው እሑድ</relative> <relative type="0">የአሁኑ እሑድ</relative> <relative type="1">የሚቀጥለው እሑድ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} እሑድ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} እሑዶች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} እሑድ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} እሑዶች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="sun-short"> <relative type="-1">ያለፈው እሑድ</relative> <relative type="0">የአሁኑ እሑድ</relative> <relative type="1">የሚቀጥለው እሑድ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} እሑዶች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} እሑዶች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} እሑዶች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} እሑዶች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="sun-narrow"> <relative type="-1">ያለፈው እሑድ</relative> <relative type="0">የአሁኑ እሑድ</relative> <relative type="1">የሚቀጥለው እሑድ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} እሑዶች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} እሑዶች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} እሑዶች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} እሑዶች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="mon"> <relative type="-1">ያለፈው ሰኞ</relative> <relative type="0">የአሁኑ ሰኞ</relative> <relative type="1">የሚቀጥለው ሰኞ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ሰኞ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ሰኞዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ሰኞ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ሰኞዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="mon-short"> <relative type="-1">ያለፈው ሰኞ</relative> <relative type="0">የአሁኑ ሰኞ</relative> <relative type="1">የሚቀጥለው ሰኞ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ሰኞዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ሰኞዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ሰኞዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ሰኞዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="mon-narrow"> <relative type="-1">ያለፈው ሰኞ</relative> <relative type="0">የአሁኑ ሰኞ</relative> <relative type="1">የሚቀጥለው ሰኞ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ሰኞዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ሰኞዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ሰኞዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ሰኞዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="tue"> <relative type="-1">ያለፈው ማክሰኞ</relative> <relative type="0">የአሁኑ ማክሰኞ</relative> <relative type="1">የሚቀጥለው ማክሰኞ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ማክሰኞ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ማክሰኞዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ማክሰኞ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ማክሰኞዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="tue-short"> <relative type="-1">ያለፈው ማክሰኞ</relative> <relative type="0">የአሁኑ ማክሰኞ</relative> <relative type="1">የሚቀጥለው ማክሰኞ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ማክሰኞዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ማክሰኞዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ማክሰኞዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ማክሰኞዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="tue-narrow"> <relative type="-1">ያለፈው ማክሰኞ</relative> <relative type="0">የአሁኑ ማክሰኞ</relative> <relative type="1">የሚቀጥለው ማክሰኞ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ማክሰኞዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ማክሰኞዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ማክሰኞዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ማክሰኞዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="wed"> <relative type="-1">ያለፈው ረቡዕ</relative> <relative type="0">የአሁኑ ረቡዕ</relative> <relative type="1">የሚቀጥለው ረቡዕ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ረቡዕ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ረቡዕዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ረቡዕ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ረቡዕዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="wed-short"> <relative type="-1">ያለፈው ረቡዕ</relative> <relative type="0">የአሁኑ ረቡዕ</relative> <relative type="1">የሚቀጥለው ረቡዕ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ረቡዕዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ረቡዕዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ረቡዕዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ረቡዕዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="wed-narrow"> <relative type="-1">ያለፈው ረቡዕ</relative> <relative type="0">የአሁኑ ረቡዕ</relative> <relative type="1">የሚቀጥለው ረቡዕ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ረቡዕዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ረቡዕዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ረቡዕዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ረቡዕዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="thu"> <relative type="-1">ያለፈው ሐሙስ</relative> <relative type="0">የአሁኑ ሐሙስ</relative> <relative type="1">የሚቀጥለው ሐሙስ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ሐሙስ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ሐሙሶች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ሐሙስ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ሐሙሶች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="thu-short"> <relative type="-1">ያለፈው ሐሙስ</relative> <relative type="0">የአሁኑ ሐሙስ</relative> <relative type="1">የሚቀጥለው ሐሙስ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ሐሙሶች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ሐሙሶች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ሐሙሶች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ሐሙሶች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="thu-narrow"> <relative type="-1">ያለፈው ሐሙስ</relative> <relative type="0">የአሁኑ ሐሙስ</relative> <relative type="1">የሚቀጥለው ሐሙስ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ሐሙሶች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ሐሙሶች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ሐሙሶች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ሐሙሶች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="fri"> <relative type="-1">ያለፈው ዓርብ</relative> <relative type="0">የአሁኑ ዓርብ</relative> <relative type="1">የሚቀጥለው ዓርብ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ዓርብ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ዓርብዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ዓርብ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ዓርብዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="fri-short"> <relative type="-1">ያለፈው ዓርብ</relative> <relative type="0">የአሁኑ ዓርብ</relative> <relative type="1">የሚቀጥለው ዓርብ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ዓርብዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ዓርብዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ዓርብዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ዓርብዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="fri-narrow"> <relative type="-1">ያለፈው ዓርብ</relative> <relative type="0">የአሁኑ ዓርብ</relative> <relative type="1">የሚቀጥለው ዓርብ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ዓርብዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ዓርብዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ዓርብዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ዓርብዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="sat"> <relative type="-1">ያለፈው ቅዳሜ</relative> <relative type="0">የአሁኑ ቅዳሜ</relative> <relative type="1">የሚቀጥለው ቅዳሜ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ቅዳሜ ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ቅዳሜዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ቅዳሜ በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ቅዳሜዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="sat-short"> <relative type="-1">ያለፈው ቅዳሜ</relative> <relative type="0">የአሁኑ ቅዳሜ</relative> <relative type="1">የሚቀጥለው ቅዳሜ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ቅዳሜዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ቅዳሜዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ቅዳሜዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ቅዳሜዎች በፊት</relativeTimePattern> + </relativeTime> </field> <field type="sat-narrow"> <relative type="-1">ያለፈው ቅዳሜ</relative> <relative type="0">የአሁኑ ቅዳሜ</relative> <relative type="1">የሚቀጥለው ቅዳሜ</relative> + <relativeTime type="future"> + <relativeTimePattern count="one">በ{0} ቅዳሜዎች ውስጥ</relativeTimePattern> + <relativeTimePattern count="other">በ{0} ቅዳሜዎች ውስጥ</relativeTimePattern> + </relativeTime> + <relativeTime type="past"> + <relativeTimePattern count="one">ከ{0} ቅዳሜዎች በፊት</relativeTimePattern> + <relativeTimePattern count="other">ከ{0} ቅዳሜዎች በፊት</relativeTimePattern> + </relativeTime> + </field> + <field type="dayperiod-short"> + <displayName>ጥዋት/ከሰዓት</displayName> </field> <field type="dayperiod"> <displayName>ጥዋት/ከሰዓት</displayName> </field> + <field type="dayperiod-narrow"> + <displayName>ጥዋት/ከሰዓት</displayName> + </field> <field type="hour"> <displayName>ሰዓት</displayName> + <relative type="0">ይህ ሰዓት</relative> <relativeTime type="future"> <relativeTimePattern count="one">በ{0} ሰዓት ውስጥ</relativeTimePattern> <relativeTimePattern count="other">በ{0} ሰዓቶች ውስጥ</relativeTimePattern> @@ -2472,6 +2839,7 @@ </field> <field type="minute"> <displayName>ደቂቃ</displayName> + <relative type="0">ይህ ደቂቃ</relative> <relativeTime type="future"> <relativeTimePattern count="one">በ{0} ደቂቃ ውስጥ</relativeTimePattern> <relativeTimePattern count="other">በ{0} ደቂቃዎች ውስጥ</relativeTimePattern> @@ -2542,6 +2910,12 @@ <field type="zone"> <displayName>የሰዓት ሰቅ</displayName> </field> + <field type="zone-short"> + <displayName>የሰዓት ሰቅ</displayName> + </field> + <field type="zone-narrow"> + <displayName>የሰዓት ሰቅ</displayName> + </field> </fields> <timeZoneNames> <hourFormat>+HHmm;-HHmm</hourFormat> @@ -2551,6 +2925,17 @@ <regionFormat type="daylight">{0} የቀን ብርሃን ሰዓት</regionFormat> <regionFormat type="standard">{0} መደበኛ ሰዓት</regionFormat> <fallbackFormat>{1} ({0})</fallbackFormat> + <zone type="America/Santa_Isabel"> + <exemplarCity>ሳንታ ኢዛቤል</exemplarCity> + </zone> + <zone type="Pacific/Honolulu"> + <exemplarCity>ሆኖሉሉ</exemplarCity> + </zone> + <zone type="Etc/UTC"> + <long> + <standard>የተቀነባበረ ሁለገብ ሰዓት</standard> + </long> + </zone> <zone type="Etc/Unknown"> <exemplarCity>ያልታወቀ ከተማ</exemplarCity> </zone> @@ -2783,7 +3168,7 @@ <exemplarCity>ሜሲኦ</exemplarCity> </zone> <zone type="America/Recife"> - <exemplarCity>ፓሲፍ</exemplarCity> + <exemplarCity>ረሲፍ</exemplarCity> </zone> <zone type="America/Noronha"> <exemplarCity>ኖሮኛ</exemplarCity> @@ -2815,6 +3200,9 @@ <zone type="America/Vancouver"> <exemplarCity>ቫንኮቨር</exemplarCity> </zone> + <zone type="America/Fort_Nelson"> + <exemplarCity>ፎርት ኔልሰን</exemplarCity> + </zone> <zone type="America/Dawson_Creek"> <exemplarCity>ዳውሰን ክሬክ</exemplarCity> </zone> @@ -2888,7 +3276,7 @@ <exemplarCity>ኮኮስ</exemplarCity> </zone> <zone type="Africa/Kinshasa"> - <exemplarCity>ኪንሳሻ</exemplarCity> + <exemplarCity>ኪንሻሳ</exemplarCity> </zone> <zone type="Africa/Lubumbashi"> <exemplarCity>ሉቡምባሺ</exemplarCity> @@ -2911,6 +3299,9 @@ <zone type="Pacific/Easter"> <exemplarCity>ፋሲካ</exemplarCity> </zone> + <zone type="America/Punta_Arenas"> + <exemplarCity>ፑንታ አሬናስ</exemplarCity> + </zone> <zone type="America/Santiago"> <exemplarCity>ሳንቲያጎ</exemplarCity> </zone> @@ -2921,7 +3312,7 @@ <exemplarCity>ኡሩምኪ</exemplarCity> </zone> <zone type="Asia/Shanghai"> - <exemplarCity>ሸንጋይ</exemplarCity> + <exemplarCity>ሻንጋይ</exemplarCity> </zone> <zone type="America/Bogota"> <exemplarCity>ቦጎታ</exemplarCity> @@ -2944,6 +3335,9 @@ <zone type="Asia/Nicosia"> <exemplarCity>ኒኮሲአ</exemplarCity> </zone> + <zone type="Asia/Famagusta"> + <exemplarCity>ፋማጉስታ</exemplarCity> + </zone> <zone type="Europe/Prague"> <exemplarCity>ፕራግ</exemplarCity> </zone> @@ -3014,7 +3408,7 @@ <exemplarCity>ፖህንፔ</exemplarCity> </zone> <zone type="Pacific/Kosrae"> - <exemplarCity>ኮስሬ እ</exemplarCity> + <exemplarCity>ኮስሬ</exemplarCity> </zone> <zone type="Atlantic/Faeroe"> <exemplarCity>ፋሮእ</exemplarCity> @@ -3023,7 +3417,7 @@ <exemplarCity>ፓሪስ</exemplarCity> </zone> <zone type="Africa/Libreville"> - <exemplarCity>ሊብርልቪል</exemplarCity> + <exemplarCity>ሊበርቪል</exemplarCity> </zone> <zone type="Europe/London"> <long> @@ -3071,7 +3465,7 @@ <exemplarCity>ጕዳሉፕ</exemplarCity> </zone> <zone type="Africa/Malabo"> - <exemplarCity>ማሌቦ</exemplarCity> + <exemplarCity>ማላቡ</exemplarCity> </zone> <zone type="Europe/Athens"> <exemplarCity>አቴንስ</exemplarCity> @@ -3202,6 +3596,9 @@ <zone type="Asia/Oral"> <exemplarCity>ኦራል</exemplarCity> </zone> + <zone type="Asia/Atyrau"> + <exemplarCity>አትይራኡ</exemplarCity> + </zone> <zone type="Asia/Aqtobe"> <exemplarCity>አኩቶቤ</exemplarCity> </zone> @@ -3269,13 +3666,13 @@ <exemplarCity>ማጁሩ</exemplarCity> </zone> <zone type="Europe/Skopje"> - <exemplarCity>ስኮፕጄ</exemplarCity> + <exemplarCity>ስኮፕየ</exemplarCity> </zone> <zone type="Africa/Bamako"> <exemplarCity>ባማኮ</exemplarCity> </zone> <zone type="Asia/Rangoon"> - <exemplarCity>ራንጉን</exemplarCity> + <exemplarCity>ያንጎን</exemplarCity> </zone> <zone type="Asia/Hovd"> <exemplarCity>ሆቭድ</exemplarCity> @@ -3316,9 +3713,6 @@ <zone type="America/Tijuana"> <exemplarCity>ቲጁአና</exemplarCity> </zone> - <zone type="America/Santa_Isabel"> - <exemplarCity>ሳንታ ኢዛቤል</exemplarCity> - </zone> <zone type="America/Hermosillo"> <exemplarCity>ኸርሞዚሎ</exemplarCity> </zone> @@ -3484,6 +3878,18 @@ <zone type="Europe/Volgograd"> <exemplarCity>ቮልጎራድ</exemplarCity> </zone> + <zone type="Europe/Saratov"> + <exemplarCity>ሳራቶቭ</exemplarCity> + </zone> + <zone type="Europe/Astrakhan"> + <exemplarCity>አስትራክሃን</exemplarCity> + </zone> + <zone type="Europe/Ulyanovsk"> + <exemplarCity>ኡልያኖቭስክ</exemplarCity> + </zone> + <zone type="Europe/Kirov"> + <exemplarCity>ኪሮቭ</exemplarCity> + </zone> <zone type="Europe/Samara"> <exemplarCity>ሳማራ</exemplarCity> </zone> @@ -3496,6 +3902,12 @@ <zone type="Asia/Novosibirsk"> <exemplarCity>ኖቮሲቢሪስክ</exemplarCity> </zone> + <zone type="Asia/Barnaul"> + <exemplarCity>ባርናኡል</exemplarCity> + </zone> + <zone type="Asia/Tomsk"> + <exemplarCity>ቶምስክ</exemplarCity> + </zone> <zone type="Asia/Novokuznetsk"> <exemplarCity>ኖቮኩትዝኔክ</exemplarCity> </zone> @@ -3662,13 +4074,10 @@ <exemplarCity>ካምፓላ</exemplarCity> </zone> <zone type="Pacific/Midway"> - <exemplarCity>አጋማሽ</exemplarCity> - </zone> - <zone type="Pacific/Johnston"> - <exemplarCity>ጆንስተን</exemplarCity> + <exemplarCity>ሚድወይ</exemplarCity> </zone> <zone type="Pacific/Wake"> - <exemplarCity>ዋቄ</exemplarCity> + <exemplarCity>ዋኬ</exemplarCity> </zone> <zone type="America/Adak"> <exemplarCity>አዳክ</exemplarCity> @@ -3676,8 +4085,8 @@ <zone type="America/Nome"> <exemplarCity>ኖሜ</exemplarCity> </zone> - <zone type="Pacific/Honolulu"> - <exemplarCity>ሆኖሉሉ</exemplarCity> + <zone type="Pacific/Johnston"> + <exemplarCity>ጆንስተን</exemplarCity> </zone> <zone type="America/Anchorage"> <exemplarCity>አንኮራጅ</exemplarCity> @@ -3901,7 +4310,7 @@ <metazone type="Argentina"> <long> <generic>የአርጀንቲና የሰዓት አቆጣጠር</generic> - <standard>የአርጀንቲና መደበኛ ጊዜ</standard> + <standard>የአርጀንቲና መደበኛ ሰዓት አቆጣጠር</standard> <daylight>የአርጀንቲና የበጋ ሰዓት አቆጣጠር</daylight> </long> </metazone> @@ -3942,7 +4351,7 @@ </metazone> <metazone type="Australia_Eastern"> <long> - <generic>የምዕራባዊ አውስትራሊያ የሰአት አቆጣጠር</generic> + <generic>የምዕራባዊ አውስትራሊያ የሰዓት አቆጣጠር</generic> <standard>የአውስትራሊያ ምዕራባዊ መደበኛ የሰዓት አቆጣጠር</standard> <daylight>የአውስትራሊያ ምዕራባዊ የቀን ሰዓት አቆጣጠር</daylight> </long> @@ -3956,9 +4365,9 @@ </metazone> <metazone type="Azerbaijan"> <long> - <generic>የአዘርባይጃን ሰዓት</generic> - <standard>የአዘርባይጃን መደበኛ ሰዓት</standard> - <daylight>የአዘርባይጃን ክረምት ሰዓት</daylight> + <generic>የአዘርባጃን ሰዓት</generic> + <standard>የአዘርባጃን መደበኛ ሰዓት</standard> + <daylight>የአዘርባጃን ክረምት ሰዓት</daylight> </long> </metazone> <metazone type="Azores"> @@ -3988,7 +4397,7 @@ <metazone type="Brasilia"> <long> <generic>የብራዚላዊ ሰዓት አቆጣጠር</generic> - <standard>የብራሲሊያ መደበኛ ጊዜ</standard> + <standard>የብራሲሊያ መደበኛ ሰዓት አቆጣጠር</standard> <daylight>የብራዚላ የበጋ ሰዓት አቆጣጠር</daylight> </long> </metazone> @@ -4034,7 +4443,7 @@ <long> <generic>የቾይባልሳ ሰዓት አቆጣጠር</generic> <standard>የቾይባልሳን መደበኛ የሰዓት አቆጣጠር</standard> - <daylight>የቾይባልሳን የበጋ የሰአት አቆጣጠር</daylight> + <daylight>የቾይባልሳን የበጋ የሰዓት አቆጣጠር</daylight> </long> </metazone> <metazone type="Christmas"> @@ -4284,12 +4693,12 @@ </metazone> <metazone type="Kazakhstan_Eastern"> <long> - <standard>የምስራቅ ካዛኪስታን ጊዜ</standard> + <standard>የምስራቅ ካዛኪስታን ሰዓት</standard> </long> </metazone> <metazone type="Kazakhstan_Western"> <long> - <standard>የምዕራብ ካዛኪስታን ጊዜ</standard> + <standard>የምዕራብ ካዛኪስታን ሰዓት</standard> </long> </metazone> <metazone type="Korea"> @@ -4527,6 +4936,11 @@ <standard>የፖናፔ ሰዓት</standard> </long> </metazone> + <metazone type="Pyongyang"> + <long> + <standard>የፕዮንግያንግ ሰዓት</standard> + </long> + </metazone> <metazone type="Reunion"> <long> <standard>የሬዩኒየን ሰዓት</standard> @@ -4845,9 +5259,9 @@ </currencyFormats> <currencies> <currency type="AED"> - <displayName>የተባበሩት የአረብ ኤምረትስ ዲርሀም</displayName> - <displayName count="one">የተባበሩት የአረብ ኤምረትስ ዲርሀም</displayName> - <displayName count="other">የተባበሩት የአረብ ኤምረትስ ዲርሀም</displayName> + <displayName>የተባበሩት የአረብ ኤምሬትስ ድርሀም</displayName> + <displayName count="one">የተባበሩት የአረብ ኤምሬትስ ድርሀም</displayName> + <displayName count="other">የተባበሩት የአረብ ኤምሬትስ ድርሀም</displayName> <symbol>AED</symbol> </currency> <currency type="AFN"> @@ -4994,12 +5408,18 @@ <symbol>BWP</symbol> <symbol alt="narrow" draft="contributed">P</symbol> </currency> - <currency type="BYR"> + <currency type="BYN"> <displayName>የቤላሩስያ ሩብል</displayName> <displayName count="one">የቤላሩስያ ሩብል</displayName> <displayName count="other">የቤላሩስያ ሩብል</displayName> + <symbol>BYN</symbol> + <symbol alt="narrow" draft="contributed">р.</symbol> + </currency> + <currency type="BYR"> + <displayName>የቤላሩስያ ሩብል (2000–2016)</displayName> + <displayName count="one">የቤላሩስያ ሩብል (2000–2016)</displayName> + <displayName count="other">የቤላሩስያ ሩብል (2000–2016)</displayName> <symbol>BYR</symbol> - <symbol alt="narrow" draft="contributed">р.</symbol> </currency> <currency type="BZD"> <displayName>የቤሊዝ ዶላር</displayName> @@ -5034,6 +5454,12 @@ <symbol>CLP</symbol> <symbol alt="narrow" draft="contributed">$</symbol> </currency> + <currency type="CNH"> + <displayName>የቻይና ዩዋን (የውጭ ምንዛሪ)</displayName> + <displayName count="one">የቻይና ዩዋን (የውጭ ምንዛሪ)</displayName> + <displayName count="other">የቻይና ዩዋን (የውጭ ምንዛሪ)</displayName> + <symbol draft="contributed">የቻይና ዩዋን</symbol> + </currency> <currency type="CNY"> <displayName>የቻይና የን</displayName> <displayName count="one">የቻይና የን</displayName> @@ -5160,6 +5586,7 @@ <displayName count="one">የጆርጅያ ላሪ</displayName> <displayName count="other">የጆርጅያ ላሪ</displayName> <symbol>GEL</symbol> + <symbol alt="narrow" draft="contributed">₾</symbol> <symbol alt="variant" draft="contributed">₾</symbol> </currency> <currency type="GHC"> @@ -5220,7 +5647,7 @@ <symbol alt="narrow" draft="contributed">L</symbol> </currency> <currency type="HRK"> - <displayName>የክሮሽያ ኩና</displayName> + <displayName>HRK</displayName> <displayName count="one">የክሮሽያ ኩና</displayName> <displayName count="other">የክሮሽያ ኩና</displayName> <symbol>HRK</symbol> @@ -5233,8 +5660,8 @@ <symbol>HTG</symbol> </currency> <currency type="HUF"> - <displayName>የሁንጋሪ ፎሪንት</displayName> - <displayName count="one">የሁንጋሪ ፎሪንት</displayName> + <displayName>የሃንጋሪያን ፎሪንት</displayName> + <displayName count="one">የሃንጋሪያን ፎሪንት</displayName> <displayName count="other">የሃንጋሪያን ፎሪንት</displayName> <symbol>HUF</symbol> <symbol alt="narrow" draft="contributed">Ft</symbol> @@ -5434,9 +5861,9 @@ <symbol>MKD</symbol> </currency> <currency type="MMK"> - <displayName>ምያንማ ክያት</displayName> - <displayName count="one">ምያንማ ክያት</displayName> - <displayName count="other">ምያንማ ክያት</displayName> + <displayName>የማያናማር ክያት</displayName> + <displayName count="one">የማያናማር ክያት</displayName> + <displayName count="other">የማያናማር ክያት</displayName> <symbol>MMK</symbol> <symbol alt="narrow" draft="contributed">K</symbol> </currency> @@ -5454,10 +5881,15 @@ <symbol>MOP</symbol> </currency> <currency type="MRO"> + <displayName>የሞሪቴኒያ ኦውጉያ (1973–2017)</displayName> + <displayName count="one">የሞሪቴኒያ ኦውጉያ (1973–2017)</displayName> + <displayName count="other">የሞሪቴኒያ ኦውጉያ (1973–2017)</displayName> + <symbol>MRO</symbol> + </currency> + <currency type="MRU"> <displayName>የሞሪቴኒያ ኦውጉያ</displayName> <displayName count="one">የሞሪቴኒያ ኦውጉያ</displayName> <displayName count="other">የሞሪቴኒያ ኦውጉያ</displayName> - <symbol>MRO</symbol> </currency> <currency type="MUR"> <displayName>የሞሪሸስ ሩፒ</displayName> @@ -5553,9 +5985,9 @@ <symbol>PAB</symbol> </currency> <currency type="PEN"> - <displayName>የፔሩቪያ ኑኤቮ ሶል</displayName> - <displayName count="one">የፔሩቪያ ኑኤቮ ሶል</displayName> - <displayName count="other">የፔሩቪያ ኑኤቮ ሶል</displayName> + <displayName>የፔሩቪያ ሶል</displayName> + <displayName count="one">የፔሩቪያ ሶል</displayName> + <displayName count="other">የፔሩቪያ ሶል</displayName> <symbol>PEN</symbol> </currency> <currency type="PGK"> @@ -5603,6 +6035,7 @@ <displayName count="one">የሮማኒያ ለው</displayName> <displayName count="other">የሮማኒያ ለው</displayName> <symbol>RON</symbol> + <symbol alt="narrow" draft="contributed">lei</symbol> </currency> <currency type="RSD"> <displayName>የሰርቢያ ዲናር</displayName> @@ -5700,10 +6133,15 @@ <symbol alt="narrow" draft="contributed">£</symbol> </currency> <currency type="STD"> - <displayName>የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ</displayName> - <displayName count="one">የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ</displayName> - <displayName count="other">የሳኦ ቶመ እና ፕሪንሲፐ ዶብራ</displayName> + <displayName>የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)</displayName> + <displayName count="one">የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)</displayName> + <displayName count="other">የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ (1977–2017)</displayName> <symbol>STD</symbol> + </currency> + <currency type="STN"> + <displayName>የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ</displayName> + <displayName count="one">የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ</displayName> + <displayName count="other">የሳኦ ቶሜ እና ፕሪንሲፔ ዶብራ</displayName> <symbol alt="narrow" draft="contributed">Db</symbol> </currency> <currency type="SYP"> @@ -5839,9 +6277,9 @@ <symbol>WST</symbol> </currency> <currency type="XAF"> - <displayName>ሴኤፍአ ፍራንክ ቤእአሴ</displayName> - <displayName count="one">ሴኤፍአ ፍራንክ ቤእአሴ</displayName> - <displayName count="other">ሴኤፍአ ፍራንክ ቤእአሴ</displayName> + <displayName>የመካከለኛው አፍሪካ ሴፋ ፍራንክ</displayName> + <displayName count="one">የመካከለኛው አፍሪካ ሴፋ ፍራንክ</displayName> + <displayName count="other">የመካከለኛው አፍሪካ ሴፋ ፍራንክ</displayName> <symbol>FCFA</symbol> </currency> <currency type="XCD"> @@ -5852,9 +6290,9 @@ <symbol alt="narrow" draft="contributed">$</symbol> </currency> <currency type="XOF"> - <displayName>ሴኤፍአ ፍራንክ ቤሴእአኦ</displayName> - <displayName count="one">ሴኤፍአ ፍራንክ ቤሴእአኦ</displayName> - <displayName count="other">ሴኤፍአ ፍራንክ ቤሴእአኦ</displayName> + <displayName>የምዕራብ አፍሪካ ሴፋ ፍራንክ</displayName> + <displayName count="one">የምዕራብ አፍሪካ ሴፋ ፍራንክ</displayName> + <displayName count="other">የምዕራብ አፍሪካ ሴፋ ፍራንክ</displayName> <symbol>CFA</symbol> </currency> <currency type="XPF"> @@ -5901,6 +6339,11 @@ <pattern type="atLeast">{0}+</pattern> <pattern type="range">{0}–{1}</pattern> </miscPatterns> + <minimalPairs> + <pluralMinimalPairs count="one">{0} ቀን</pluralMinimalPairs> + <pluralMinimalPairs count="other">{0} ቀናት</pluralMinimalPairs> + <ordinalMinimalPairs ordinal="other">በቀኝ በኩል ባለው በ{0}ኛው መታጠፊያ ግባ።</ordinalMinimalPairs> + </minimalPairs> </numbers> <units> <unitLength type="long"> @@ -5946,6 +6389,7 @@ <displayName>ካሬ ኪሎሜትር</displayName> <unitPattern count="one">{0} ካሬ ኪሎሜትር</unitPattern> <unitPattern count="other">{0} ካሬ ኪሎሜትር</unitPattern> + <perUnitPattern>{0}/ኪሜ²</perUnitPattern> </unit> <unit type="area-hectare"> <displayName>ሄክታር</displayName> @@ -5968,6 +6412,7 @@ <displayName>ካሬ ማይል</displayName> <unitPattern count="one">{0} ካሬ ማይል</unitPattern> <unitPattern count="other">{0} ካሬ ማይል</unitPattern> + <perUnitPattern>{0}/ማይል²</perUnitPattern> </unit> <unit type="area-acre"> <displayName>ኤክር</displayName> @@ -5995,6 +6440,21 @@ <unitPattern count="one">{0} ካራት</unitPattern> <unitPattern count="other">{0} ካራት</unitPattern> </unit> + <unit type="concentr-milligram-per-deciliter"> + <displayName>ሚሊ ግራም በ ዴሲ ሊትር</displayName> + <unitPattern count="one">{0} mg/dL</unitPattern> + <unitPattern count="other">{0} mg/dL</unitPattern> + </unit> + <unit type="concentr-millimole-per-liter"> + <displayName>mmol/L</displayName> + <unitPattern count="one">{0} mmol/L</unitPattern> + <unitPattern count="other">{0} mmol/L</unitPattern> + </unit> + <unit type="concentr-part-per-million"> + <displayName>ppm</displayName> + <unitPattern count="one">{0} ppm</unitPattern> + <unitPattern count="other">{0} ppm</unitPattern> + </unit> <unit type="consumption-liter-per-kilometer"> <displayName>ሊ/ኪሜ</displayName> <unitPattern count="one">{0} ሊ/ኪሜ</unitPattern> @@ -6010,10 +6470,15 @@ <unitPattern count="one">{0} mpg</unitPattern> <unitPattern count="other">{0} mpg</unitPattern> </unit> + <unit type="consumption-mile-per-gallon-imperial"> + <displayName>mpg Imp.</displayName> + <unitPattern count="one">{0} mpg Imp.</unitPattern> + <unitPattern count="other">{0} mpg Imp.</unitPattern> + </unit> <unit type="digital-terabyte"> - <displayName>ቴባይት</displayName> - <unitPattern count="one">{0} ቴባይት</unitPattern> - <unitPattern count="other">{0} ቴባይት</unitPattern> + <displayName>ቴራባይት</displayName> + <unitPattern count="one">{0} ቴራባይት</unitPattern> + <unitPattern count="other">{0} ቴራባይት</unitPattern> </unit> <unit type="digital-terabit"> <displayName>ቴባ</displayName> @@ -6026,14 +6491,14 @@ <unitPattern count="other">{0} ጊባ</unitPattern> </unit> <unit type="digital-gigabit"> - <displayName>ጊባይት</displayName> - <unitPattern count="one">{0} ጊባይት</unitPattern> - <unitPattern count="other">{0} ጊባይት</unitPattern> + <displayName>ጊጋባይት</displayName> + <unitPattern count="one">{0} ጊጋባይት</unitPattern> + <unitPattern count="other">{0} ጊጋባይት</unitPattern> </unit> <unit type="digital-megabyte"> - <displayName>ሜባይት</displayName> - <unitPattern count="one">{0} ሜባይት</unitPattern> - <unitPattern count="other">{0} ሜባይት</unitPattern> + <displayName>ሜጋባይት</displayName> + <unitPattern count="one">{0} ሜጋባይት</unitPattern> + <unitPattern count="other">{0} ሜጋባይት</unitPattern> </unit> <unit type="digital-megabit"> <displayName>ሜባ</displayName> @@ -6046,9 +6511,9 @@ <unitPattern count="other">{0} ኪባ</unitPattern> </unit> <unit type="digital-kilobit"> - <displayName>ኪባይት</displayName> - <unitPattern count="one">{0} ኪባይት</unitPattern> - <unitPattern count="other">{0} ኪባይት</unitPattern> + <displayName>ኪሎባይት</displayName> + <unitPattern count="one">{0} ኪሎባይት</unitPattern> + <unitPattern count="other">{0} ኪሎባይት</unitPattern> </unit> <unit type="digital-byte"> <displayName>ባይት</displayName> @@ -6205,9 +6670,9 @@ <perUnitPattern>{0}/ሜ</perUnitPattern> </unit> <unit type="length-decimeter"> - <displayName>dm</displayName> - <unitPattern count="one">{0} dm</unitPattern> - <unitPattern count="other">{0} dm</unitPattern> + <displayName>ዴሲ ሜትር</displayName> + <unitPattern count="one">{0} ዴሲ ሜትር</unitPattern> + <unitPattern count="other">{0} ዴሲ ሜትር</unitPattern> </unit> <unit type="length-centimeter"> <displayName>ሴንቲሜትር</displayName> @@ -6221,14 +6686,14 @@ <unitPattern count="other">{0} ሚሊሜትር</unitPattern> </unit> <unit type="length-micrometer"> - <displayName>µm</displayName> - <unitPattern count="one">{0} µm</unitPattern> - <unitPattern count="other">{0} µm</unitPattern> + <displayName>ማይክሮ ሜትር</displayName> + <unitPattern count="one">{0} ማይክሮ ሜትር</unitPattern> + <unitPattern count="other">{0} ማይክሮ ሜትር</unitPattern> </unit> <unit type="length-nanometer"> - <displayName>nm</displayName> - <unitPattern count="one">{0} nm</unitPattern> - <unitPattern count="other">{0} nm</unitPattern> + <displayName>ናኖ ሜትር</displayName> + <unitPattern count="one">{0} ናኖ ሜትር</unitPattern> + <unitPattern count="other">{0} ናኖ ሜትር</unitPattern> </unit> <unit type="length-picometer"> <displayName>ፒኮሜትር</displayName> @@ -6282,6 +6747,11 @@ <unitPattern count="one">{0} ስማይል</unitPattern> <unitPattern count="other">{0} ስማይል</unitPattern> </unit> + <unit type="length-point"> + <displayName>ነጥብ</displayName> + <unitPattern count="one">{0} ነጥብ</unitPattern> + <unitPattern count="other">{0} ነጥብ</unitPattern> + </unit> <unit type="light-lux"> <displayName>lx</displayName> <unitPattern count="one">{0} lx</unitPattern> @@ -6490,9 +6960,9 @@ <perUnitPattern>{0}/ሊትር</perUnitPattern> </unit> <unit type="volume-deciliter"> - <displayName>dL</displayName> - <unitPattern count="one">{0} dL</unitPattern&