web/lib/Zend/Locale/Data/root.xml
changeset 1230 68c69c656a2c
parent 207 621fa6caec0c
--- a/web/lib/Zend/Locale/Data/root.xml	Thu May 07 15:10:09 2015 +0200
+++ b/web/lib/Zend/Locale/Data/root.xml	Thu May 07 15:16:02 2015 +0200
@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE ldml SYSTEM "../../common/dtd/ldml.dtd">
+<!-- Copyright © 1991-2013 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
+-->
 <ldml>
 	<identity>
-		<version number="$Revision: 1.192 $"/>
-		<generation date="$Date: 2009/06/15 21:39:59 $"/>
+		<version number="$Revision: 9737 $"/>
+		<generation date="$Date: 2014-02-14 16:49:13 -0600 (Fri, 14 Feb 2014) $"/>
 		<language type="root"/>
 	</identity>
-	<fallback/>
 	<localeDisplayNames>
 		<localeDisplayPattern>
 			<localePattern>{0} ({1})</localePattern>
-			<localeSeparator>, </localeSeparator>
+			<localeSeparator>{0}, {1}</localeSeparator>
+			<localeKeyTypePattern>{0}: {1}</localeKeyTypePattern>
 		</localeDisplayPattern>
 		<measurementSystemNames>
 			<measurementSystemName type="metric">Metric</measurementSystemName>
+			<measurementSystemName type="UK">UK</measurementSystemName>
 			<measurementSystemName type="US">US</measurementSystemName>
 		</measurementSystemNames>
 		<codePatterns>
@@ -22,26 +28,22 @@
 		</codePatterns>
 	</localeDisplayNames>
 	<layout>
-		<orientation/>
-		<inList>mixed</inList>
-		<inText type="currency">mixed</inText>
-		<inText type="dayWidth">mixed</inText>
-		<inText type="fields">mixed</inText>
-		<inText type="keys">mixed</inText>
-		<inText type="languages">mixed</inText>
-		<inText type="long">mixed</inText>
-		<inText type="measurementSystemNames">mixed</inText>
-		<inText type="monthWidth">mixed</inText>
-		<inText type="quarterWidth">mixed</inText>
-		<inText type="scripts">mixed</inText>
-		<inText type="territories">mixed</inText>
-		<inText type="types">mixed</inText>
-		<inText type="variants">mixed</inText>
+		<orientation>
+			<characterOrder>left-to-right</characterOrder>
+			<lineOrder>top-to-bottom</lineOrder>
+		</orientation>
 	</layout>
 	<characters>
 		<exemplarCharacters>[]</exemplarCharacters>
 		<exemplarCharacters type="auxiliary">[]</exemplarCharacters>
-		<exemplarCharacters type="currencySymbol">[a-c č d-l ł m-o º p-z]</exemplarCharacters>
+		<exemplarCharacters type="punctuation">[\- , ; \: ! ? . ( ) \[ \] \{ \}]</exemplarCharacters>
+		<ellipsis type="final">{0}…</ellipsis>
+		<ellipsis type="initial">…{0}</ellipsis>
+		<ellipsis type="medial">{0}…{1}</ellipsis>
+		<ellipsis type="word-final">{0} …</ellipsis>
+		<ellipsis type="word-initial">… {0}</ellipsis>
+		<ellipsis type="word-medial">{0} … {1}</ellipsis>
+		<moreInformation>?</moreInformation>
 	</characters>
 	<delimiters>
 		<quotationStart>“</quotationStart>
@@ -50,9 +52,7 @@
 		<alternateQuotationEnd>’</alternateQuotationEnd>
 	</delimiters>
 	<dates>
-		<dateRangePattern>{0} - {1}</dateRangePattern>
 		<calendars>
-			<default choice="gregorian"/>
 			<calendar type="buddhist">
 				<months>
 					<alias source="locale" path="../../calendar[@type='gregorian']/months"/>
@@ -63,97 +63,34 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">BE</era>
+						<!-- = 544 BC gregorian. -->
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, y G</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>M/d/yyyy</pattern>
-						</dateFormat>
-					</dateFormatLength>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<dateTimeFormatLength>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength"/>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">EEE d</dateFormatItem>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
-						<dateFormatItem id="MMM">LLL</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">M/y</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, M/d/y</dateFormatItem>
-						<dateFormatItem id="yMMM">MMM, y</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, MMM d, y</dateFormatItem>
-						<dateFormatItem id="yMMMM">MMMM, y</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
-						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/intervalFormats"/>
-					</intervalFormats>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="chinese">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -161,18 +98,18 @@
 							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
+							<month type="1">M01</month>
+							<month type="2">M02</month>
+							<month type="3">M03</month>
+							<month type="4">M04</month>
+							<month type="5">M05</month>
+							<month type="6">M06</month>
+							<month type="7">M07</month>
+							<month type="8">M08</month>
+							<month type="9">M09</month>
+							<month type="10">M10</month>
+							<month type="11">M11</month>
+							<month type="12">M12</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
@@ -198,34 +135,182 @@
 						</monthWidth>
 					</monthContext>
 				</months>
+				<monthPatterns>
+					<monthPatternContext type="format">
+						<monthPatternWidth type="abbreviated">
+							<alias source="locale" path="../monthPatternWidth[@type='wide']"/>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<alias source="locale" path="../../monthPatternContext[@type='stand-alone']/monthPatternWidth[@type='narrow']"/>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<monthPattern type="leap">{0}bis</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="numeric">
+						<monthPatternWidth type="all">
+							<monthPattern type="leap">{0}bis</monthPattern>
+						</monthPatternWidth>
+					</monthPatternContext>
+					<monthPatternContext type="stand-alone">
+						<monthPatternWidth type="abbreviated">
+							<alias source="locale" path="../../monthPatternContext[@type='format']/monthPatternWidth[@type='abbreviated']"/>
+						</monthPatternWidth>
+						<monthPatternWidth type="narrow">
+							<monthPattern type="leap">{0}b</monthPattern>
+						</monthPatternWidth>
+						<monthPatternWidth type="wide">
+							<alias source="locale" path="../../monthPatternContext[@type='format']/monthPatternWidth[@type='wide']"/>
+						</monthPatternWidth>
+					</monthPatternContext>
+				</monthPatterns>
 				<days>
 					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
 				</days>
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
+				<!-- chinese eras are computed, and don't fall back to gregorian -->
+				<cyclicNameSets>
+					<cyclicNameSet type="dayParts">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">zi</cyclicName>
+								<cyclicName type="2">chou</cyclicName>
+								<cyclicName type="3">yin</cyclicName>
+								<cyclicName type="4">mao</cyclicName>
+								<cyclicName type="5">chen</cyclicName>
+								<cyclicName type="6">si</cyclicName>
+								<cyclicName type="7">wu</cyclicName>
+								<cyclicName type="8">wei</cyclicName>
+								<cyclicName type="9">shen</cyclicName>
+								<cyclicName type="10">you</cyclicName>
+								<cyclicName type="11">xu</cyclicName>
+								<cyclicName type="12">hai</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<alias source="locale" path="../cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<alias source="locale" path="../cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="days">
+						<alias source="locale" path="../cyclicNameSet[@type='years']"/>
+					</cyclicNameSet>
+					<cyclicNameSet type="months">
+						<alias source="locale" path="../cyclicNameSet[@type='years']"/>
+					</cyclicNameSet>
+					<cyclicNameSet type="years">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<cyclicName type="1">jia-zi</cyclicName>
+								<cyclicName type="2">yi-chou</cyclicName>
+								<cyclicName type="3">bing-yin</cyclicName>
+								<cyclicName type="4">ding-mao</cyclicName>
+								<cyclicName type="5">wu-chen</cyclicName>
+								<cyclicName type="6">ji-si</cyclicName>
+								<cyclicName type="7">geng-wu</cyclicName>
+								<cyclicName type="8">xin-wei</cyclicName>
+								<cyclicName type="9">ren-shen</cyclicName>
+								<cyclicName type="10">gui-you</cyclicName>
+								<cyclicName type="11">jia-xu</cyclicName>
+								<cyclicName type="12">yi-hai</cyclicName>
+								<cyclicName type="13">bing-zi</cyclicName>
+								<cyclicName type="14">ding-chou</cyclicName>
+								<cyclicName type="15">wu-yin</cyclicName>
+								<cyclicName type="16">ji-mao</cyclicName>
+								<cyclicName type="17">geng-chen</cyclicName>
+								<cyclicName type="18">xin-si</cyclicName>
+								<cyclicName type="19">ren-wu</cyclicName>
+								<cyclicName type="20">gui-wei</cyclicName>
+								<cyclicName type="21">jia-shen</cyclicName>
+								<cyclicName type="22">yi-you</cyclicName>
+								<cyclicName type="23">bing-xu</cyclicName>
+								<cyclicName type="24">ding-hai</cyclicName>
+								<cyclicName type="25">wu-zi</cyclicName>
+								<cyclicName type="26">ji-chou</cyclicName>
+								<cyclicName type="27">geng-yin</cyclicName>
+								<cyclicName type="28">xin-mao</cyclicName>
+								<cyclicName type="29">ren-chen</cyclicName>
+								<cyclicName type="30">gui-si</cyclicName>
+								<cyclicName type="31">jia-wu</cyclicName>
+								<cyclicName type="32">yi-wei</cyclicName>
+								<cyclicName type="33">bing-shen</cyclicName>
+								<cyclicName type="34">ding-you</cyclicName>
+								<cyclicName type="35">wu-xu</cyclicName>
+								<cyclicName type="36">ji-hai</cyclicName>
+								<cyclicName type="37">geng-zi</cyclicName>
+								<cyclicName type="38">xin-chou</cyclicName>
+								<cyclicName type="39">ren-yin</cyclicName>
+								<cyclicName type="40">gui-mao</cyclicName>
+								<cyclicName type="41">jia-chen</cyclicName>
+								<cyclicName type="42">yi-si</cyclicName>
+								<cyclicName type="43">bing-wu</cyclicName>
+								<cyclicName type="44">ding-wei</cyclicName>
+								<cyclicName type="45">wu-shen</cyclicName>
+								<cyclicName type="46">ji-you</cyclicName>
+								<cyclicName type="47">geng-xu</cyclicName>
+								<cyclicName type="48">xin-hai</cyclicName>
+								<cyclicName type="49">ren-zi</cyclicName>
+								<cyclicName type="50">gui-chou</cyclicName>
+								<cyclicName type="51">jia-yin</cyclicName>
+								<cyclicName type="52">yi-mao</cyclicName>
+								<cyclicName type="53">bing-chen</cyclicName>
+								<cyclicName type="54">ding-si</cyclicName>
+								<cyclicName type="55">wu-wu</cyclicName>
+								<cyclicName type="56">ji-wei</cyclicName>
+								<cyclicName type="57">geng-shen</cyclicName>
+								<cyclicName type="58">xin-you</cyclicName>
+								<cyclicName type="59">ren-xu</cyclicName>
+								<cyclicName type="60">gui-hai</cyclicName>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<alias source="locale" path="../cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<alias source="locale" path="../cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+					<cyclicNameSet type="zodiacs">
+						<cyclicNameContext type="format">
+							<cyclicNameWidth type="abbreviated">
+								<alias source="locale" path="../../../cyclicNameSet[@type='dayParts']/cyclicNameContext[@type='format']/cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="narrow">
+								<alias source="locale" path="../cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+							<cyclicNameWidth type="wide">
+								<alias source="locale" path="../cyclicNameWidth[@type='abbreviated']"/>
+							</cyclicNameWidth>
+						</cyclicNameContext>
+					</cyclicNameSet>
+				</cyclicNameSets>
 				<dateFormats>
-					<default choice="medium"/>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE y'x'G-Ml-d</pattern>
+							<pattern>U MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
 						<dateFormat>
-							<pattern>y'x'G-Ml-d</pattern>
+							<pattern>U MMMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="medium">
 						<dateFormat>
-							<pattern>y'x'G-Ml-d</pattern>
+							<pattern>U MMM d</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>y'x'G-Ml-d</pattern>
+							<!-- using y here to be short in locales that may not understand U anyway -->
+							<pattern>y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
@@ -233,14 +318,171 @@
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="Ed">d, E</dateFormatItem>
+						<dateFormatItem id="Gy">U</dateFormatItem>
+						<dateFormatItem id="GyMMM">U MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">U MMM d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">U MMM d, E</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">MM-dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">U</dateFormatItem>
+						<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyy">U</dateFormatItem>
+						<dateFormatItem id="yyyyM">y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">y-MM-dd, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">U MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">U MMM d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">U MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">U QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">U QQQQ</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Day">{0} ({2}: {1})</appendItem>
+						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
+						<appendItem request="Era">{1} {0}</appendItem>
+						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
+						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
+						<appendItem request="Month">{0} ({2}: {1})</appendItem>
+						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
+						<appendItem request="Second">{0} ({2}: {1})</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+						<appendItem request="Week">{0} ({2}: {1})</appendItem>
+						<appendItem request="Year">{1} {0}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">MM–MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">U–U</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">U MMM–MMM</greatestDifference>
+							<greatestDifference id="y">U MMM – U MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">U MMM d–d</greatestDifference>
+							<greatestDifference id="M">U MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">U MMM d – U MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">U MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">U MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">U MMM d, E – U MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">U MMMM–MMMM</greatestDifference>
+							<greatestDifference id="y">U MMMM – U MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="coptic">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -293,8 +535,9 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
@@ -308,20 +551,47 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="dangi">
+				<months>
+					<alias source="locale" path="../../calendar[@type='chinese']/months"/>
+				</months>
+				<monthPatterns>
+					<alias source="locale" path="../../calendar[@type='chinese']/monthPatterns"/>
+				</monthPatterns>
+				<days>
+					<alias source="locale" path="../../calendar[@type='chinese']/days"/>
+				</days>
+				<quarters>
+					<alias source="locale" path="../../calendar[@type='chinese']/quarters"/>
+				</quarters>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='chinese']/dayPeriods"/>
+				</dayPeriods>
+				<cyclicNameSets>
+					<alias source="locale" path="../../calendar[@type='chinese']/cyclicNameSets"/>
+				</cyclicNameSets>
+				<dateFormats>
+					<alias source="locale" path="../../calendar[@type='chinese']/dateFormats"/>
+				</dateFormats>
+				<timeFormats>
+					<alias source="locale" path="../../calendar[@type='chinese']/timeFormats"/>
+				</timeFormats>
+				<dateTimeFormats>
+					<alias source="locale" path="../../calendar[@type='chinese']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="ethiopic">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -374,8 +644,9 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
@@ -389,13 +660,13 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="ethiopic-amete-alem">
@@ -403,13 +674,14 @@
 					<alias source="locale" path="../../calendar[@type='ethiopic']/months"/>
 				</months>
 				<days>
-					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
+					<alias source="locale" path="../../calendar[@type='ethiopic']/days"/>
 				</days>
 				<quarters>
-					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
+					<alias source="locale" path="../../calendar[@type='ethiopic']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='ethiopic']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
@@ -422,20 +694,18 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='ethiopic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
+					<alias source="locale" path="../../calendar[@type='ethiopic']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='ethiopic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
-			<calendar type="gregorian">
+			<calendar type="generic">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -443,18 +713,18 @@
 							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
 						</monthWidth>
 						<monthWidth type="wide">
-							<month type="1">1</month>
-							<month type="2">2</month>
-							<month type="3">3</month>
-							<month type="4">4</month>
-							<month type="5">5</month>
-							<month type="6">6</month>
-							<month type="7">7</month>
-							<month type="8">8</month>
-							<month type="9">9</month>
-							<month type="10">10</month>
-							<month type="11">11</month>
-							<month type="12">12</month>
+							<month type="1">M01</month>
+							<month type="2">M02</month>
+							<month type="3">M03</month>
+							<month type="4">M04</month>
+							<month type="5">M05</month>
+							<month type="6">M06</month>
+							<month type="7">M07</month>
+							<month type="8">M08</month>
+							<month type="9">M09</month>
+							<month type="10">M10</month>
+							<month type="11">M11</month>
+							<month type="12">M12</month>
 						</monthWidth>
 					</monthContext>
 					<monthContext type="stand-alone">
@@ -481,23 +751,283 @@
 					</monthContext>
 				</months>
 				<days>
-					<default choice="format"/>
+					<alias source="locale" path="../../calendar[@type='gregorian']/days"/>
+				</days>
+				<quarters>
+					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
+				</quarters>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
+				<eras>
+					<eraNames>
+						<alias source="locale" path="../eraAbbr"/>
+					</eraNames>
+					<eraAbbr>
+						<era type="0">ERA0</era>
+						<era type="1">ERA1</era>
+					</eraAbbr>
+					<eraNarrow>
+						<alias source="locale" path="../eraAbbr"/>
+					</eraNarrow>
+				</eras>
+				<dateFormats>
+					<dateFormatLength type="full">
+						<dateFormat>
+							<pattern>G y MMMM d, EEEE</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="long">
+						<dateFormat>
+							<pattern>G y MMMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="medium">
+						<dateFormat>
+							<pattern>G y MMM d</pattern>
+						</dateFormat>
+					</dateFormatLength>
+					<dateFormatLength type="short">
+						<dateFormat>
+							<pattern>GGGGG y-MM-dd</pattern>
+						</dateFormat>
+					</dateFormatLength>
+				</dateFormats>
+				<timeFormats>
+					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
+				</timeFormats>
+				<dateTimeFormats>
+					<dateTimeFormatLength type="full">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="long">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="medium">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<dateTimeFormatLength type="short">
+						<dateTimeFormat>
+							<pattern>{1} {0}</pattern>
+						</dateTimeFormat>
+					</dateTimeFormatLength>
+					<availableFormats>
+						<dateFormatItem id="d">d</dateFormatItem>
+						<dateFormatItem id="Ed">d, E</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">G y</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
+						<dateFormatItem id="hm">h:mm a</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
+						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
+						<dateFormatItem id="M">L</dateFormatItem>
+						<dateFormatItem id="Md">MM-dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
+						<dateFormatItem id="MMM">LLL</dateFormatItem>
+						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
+						<dateFormatItem id="ms">mm:ss</dateFormatItem>
+						<dateFormatItem id="y">G y</dateFormatItem>
+						<dateFormatItem id="yyyy">G y</dateFormatItem>
+						<dateFormatItem id="yyyyM">GGGGG y-MM</dateFormatItem>
+						<dateFormatItem id="yyyyMd">GGGGG y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yyyyMEd">GGGGG y-MM-dd, E</dateFormatItem>
+						<dateFormatItem id="yyyyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="yyyyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="yyyyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="yyyyQQQ">G y QQQ</dateFormatItem>
+						<dateFormatItem id="yyyyQQQQ">G y QQQQ</dateFormatItem>
+					</availableFormats>
+					<appendItems>
+						<appendItem request="Day">{0} ({2}: {1})</appendItem>
+						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
+						<appendItem request="Era">{1} {0}</appendItem>
+						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
+						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
+						<appendItem request="Month">{0} ({2}: {1})</appendItem>
+						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
+						<appendItem request="Second">{0} ({2}: {1})</appendItem>
+						<appendItem request="Timezone">{0} {1}</appendItem>
+						<appendItem request="Week">{0} ({2}: {1})</appendItem>
+						<appendItem request="Year">{1} {0}</appendItem>
+					</appendItems>
+					<intervalFormats>
+						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
+						<intervalFormatItem id="d">
+							<greatestDifference id="d">d–d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="h">
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hm">
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hmv">
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="hv">
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="M">
+							<greatestDifference id="M">MM–MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Md">
+							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
+							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MEd">
+							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMM">
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMd">
+							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="MMMEd">
+							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="y">
+							<greatestDifference id="y">G y–y</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yM">
+							<greatestDifference id="M">GGGGG y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM – y-MM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMd">
+							<greatestDifference id="d">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd – y-MM-dd</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMEd">
+							<greatestDifference id="d">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">GGGGG y-MM-dd, E – y-MM-dd, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMM">
+							<greatestDifference id="M">G y MMM–MMM</greatestDifference>
+							<greatestDifference id="y">G y MMM – y MMM</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMd">
+							<greatestDifference id="d">G y MMM d–d</greatestDifference>
+							<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">G y MMM d – y MMM d</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMEd">
+							<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="yMMMM">
+							<greatestDifference id="M">G y MMMM–MMMM</greatestDifference>
+							<greatestDifference id="y">G y MMMM – y MMMM</greatestDifference>
+						</intervalFormatItem>
+					</intervalFormats>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="abbreviated">
+							<alias source="locale" path="../monthWidth[@type='wide']"/>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
+						</monthWidth>
+						<monthWidth type="wide">
+							<month type="1">M01</month>
+							<month type="2">M02</month>
+							<month type="3">M03</month>
+							<month type="4">M04</month>
+							<month type="5">M05</month>
+							<month type="6">M06</month>
+							<month type="7">M07</month>
+							<month type="8">M08</month>
+							<month type="9">M09</month>
+							<month type="10">M10</month>
+							<month type="11">M11</month>
+							<month type="12">M12</month>
+						</monthWidth>
+					</monthContext>
+					<monthContext type="stand-alone">
+						<monthWidth type="abbreviated">
+							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='abbreviated']"/>
+						</monthWidth>
+						<monthWidth type="narrow">
+							<month type="1">1</month>
+							<month type="2">2</month>
+							<month type="3">3</month>
+							<month type="4">4</month>
+							<month type="5">5</month>
+							<month type="6">6</month>
+							<month type="7">7</month>
+							<month type="8">8</month>
+							<month type="9">9</month>
+							<month type="10">10</month>
+							<month type="11">11</month>
+							<month type="12">12</month>
+						</monthWidth>
+						<monthWidth type="wide">
+							<alias source="locale" path="../../monthContext[@type='format']/monthWidth[@type='wide']"/>
+						</monthWidth>
+					</monthContext>
+				</months>
+				<days>
 					<dayContext type="format">
-						<default choice="wide"/>
 						<dayWidth type="abbreviated">
 							<alias source="locale" path="../dayWidth[@type='wide']"/>
 						</dayWidth>
 						<dayWidth type="narrow">
 							<alias source="locale" path="../../dayContext[@type='stand-alone']/dayWidth[@type='narrow']"/>
 						</dayWidth>
+						<dayWidth type="short">
+							<alias source="locale" path="../dayWidth[@type='abbreviated']"/>
+						</dayWidth>
 						<dayWidth type="wide">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
+							<day type="sun">Sun</day>
+							<day type="mon">Mon</day>
+							<day type="tue">Tue</day>
+							<day type="wed">Wed</day>
+							<day type="thu">Thu</day>
+							<day type="fri">Fri</day>
+							<day type="sat">Sat</day>
 						</dayWidth>
 					</dayContext>
 					<dayContext type="stand-alone">
@@ -505,13 +1035,16 @@
 							<alias source="locale" path="../../dayContext[@type='format']/dayWidth[@type='abbreviated']"/>
 						</dayWidth>
 						<dayWidth type="narrow">
-							<day type="sun">1</day>
-							<day type="mon">2</day>
-							<day type="tue">3</day>
-							<day type="wed">4</day>
-							<day type="thu">5</day>
-							<day type="fri">6</day>
-							<day type="sat">7</day>
+							<day type="sun">S</day>
+							<day type="mon">M</day>
+							<day type="tue">T</day>
+							<day type="wed">W</day>
+							<day type="thu">T</day>
+							<day type="fri">F</day>
+							<day type="sat">S</day>
+						</dayWidth>
+						<dayWidth type="short">
+							<alias source="locale" path="../../dayContext[@type='format']/dayWidth[@type='short']"/>
 						</dayWidth>
 						<dayWidth type="wide">
 							<alias source="locale" path="../../dayContext[@type='format']/dayWidth[@type='wide']"/>
@@ -548,8 +1081,26 @@
 						</quarterWidth>
 					</quarterContext>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<dayPeriodContext type="format">
+						<dayPeriodWidth type="abbreviated">
+							<alias source="locale" path="../dayPeriodWidth[@type='wide']"/>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="narrow">
+							<dayPeriod type="am">a</dayPeriod>
+                                                        <dayPeriod type="noon">n</dayPeriod>
+							<dayPeriod type="pm">p</dayPeriod>
+						</dayPeriodWidth>
+						<dayPeriodWidth type="wide">
+							<dayPeriod type="am">AM</dayPeriod>
+                                                        <dayPeriod type="noon">noon</dayPeriod>
+							<dayPeriod type="pm">PM</dayPeriod>
+						</dayPeriodWidth>
+					</dayPeriodContext>
+					<dayPeriodContext type="stand-alone">
+						<alias source="locale" path="../dayPeriodContext[@type='format']"/>
+					</dayPeriodContext>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
@@ -563,10 +1114,9 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<default choice="medium"/>
 					<dateFormatLength type="full">
 						<dateFormat>
-							<pattern>EEEE, y MMMM dd</pattern>
+							<pattern>y MMMM d, EEEE</pattern>
 						</dateFormat>
 					</dateFormatLength>
 					<dateFormatLength type="long">
@@ -581,12 +1131,11 @@
 					</dateFormatLength>
 					<dateFormatLength type="short">
 						<dateFormat>
-							<pattern>yyyy-MM-dd</pattern>
+							<pattern>y-MM-dd</pattern>
 						</dateFormat>
 					</dateFormatLength>
 				</dateFormats>
 				<timeFormats>
-					<default choice="medium"/>
 					<timeFormatLength type="full">
 						<timeFormat>
 							<pattern>HH:mm:ss zzzz</pattern>
@@ -609,7 +1158,6 @@
 					</timeFormatLength>
 				</timeFormats>
 				<dateTimeFormats>
-					<default choice="medium"/>
 					<dateTimeFormatLength type="full">
 						<dateTimeFormat>
 							<pattern>{1} {0}</pattern>
@@ -632,33 +1180,42 @@
 					</dateTimeFormatLength>
 					<availableFormats>
 						<dateFormatItem id="d">d</dateFormatItem>
-						<dateFormatItem id="EEEd">d EEE</dateFormatItem>
+						<dateFormatItem id="Ed">d, E</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">G y</dateFormatItem>
+						<dateFormatItem id="GyMMM">G y MMM</dateFormatItem>
+						<dateFormatItem id="GyMMMd">G y MMM d</dateFormatItem>
+						<dateFormatItem id="GyMMMEd">G y MMM d, E</dateFormatItem>
+						<dateFormatItem id="h">h a</dateFormatItem>
+						<dateFormatItem id="H">HH</dateFormatItem>
 						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
+						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
 						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
+						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
 						<dateFormatItem id="M">L</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M-d</dateFormatItem>
+						<dateFormatItem id="Md">MM-dd</dateFormatItem>
+						<dateFormatItem id="MEd">MM-dd, E</dateFormatItem>
 						<dateFormatItem id="MMM">LLL</dateFormatItem>
 						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="MMMMEd">E MMMM d</dateFormatItem>
+						<dateFormatItem id="MMMEd">MMM d, E</dateFormatItem>
 						<dateFormatItem id="ms">mm:ss</dateFormatItem>
 						<dateFormatItem id="y">y</dateFormatItem>
-						<dateFormatItem id="yM">y-M</dateFormatItem>
-						<dateFormatItem id="yMEd">EEE, y-M-d</dateFormatItem>
+						<dateFormatItem id="yM">y-MM</dateFormatItem>
+						<dateFormatItem id="yMd">y-MM-dd</dateFormatItem>
+						<dateFormatItem id="yMEd">y-MM-dd, E</dateFormatItem>
 						<dateFormatItem id="yMMM">y MMM</dateFormatItem>
-						<dateFormatItem id="yMMMEd">EEE, y MMM d</dateFormatItem>
-						<dateFormatItem id="yMMMM">y MMMM</dateFormatItem>
-						<dateFormatItem id="yQ">y Q</dateFormatItem>
+						<dateFormatItem id="yMMMd">y MMM d</dateFormatItem>
+						<dateFormatItem id="yMMMEd">y MMM d, E</dateFormatItem>
 						<dateFormatItem id="yQQQ">y QQQ</dateFormatItem>
+						<dateFormatItem id="yQQQQ">y QQQQ</dateFormatItem>
 					</availableFormats>
 					<appendItems>
 						<appendItem request="Day">{0} ({2}: {1})</appendItem>
 						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
+						<appendItem request="Era">{1} {0}</appendItem>
 						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
 						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
 						<appendItem request="Month">{0} ({2}: {1})</appendItem>
@@ -666,137 +1223,108 @@
 						<appendItem request="Second">{0} ({2}: {1})</appendItem>
 						<appendItem request="Timezone">{0} {1}</appendItem>
 						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
+						<appendItem request="Year">{1} {0}</appendItem>
 					</appendItems>
 					<intervalFormats>
 						<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
 						<intervalFormatItem id="d">
-							<greatestDifference id="d">d-d</greatestDifference>
+							<greatestDifference id="d">d–d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="h">
-							<greatestDifference id="a">HH-HH</greatestDifference>
-							<greatestDifference id="h">HH-HH</greatestDifference>
+							<greatestDifference id="a">h a – h a</greatestDifference>
+							<greatestDifference id="h">h–h a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="H">
+							<greatestDifference id="H">HH–HH</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hm">
-							<greatestDifference id="a">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hm">
+							<greatestDifference id="H">HH:mm–HH:mm</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hmv">
-							<greatestDifference id="a">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="h">HH:mm-HH:mm v</greatestDifference>
-							<greatestDifference id="m">HH:mm-HH:mm v</greatestDifference>
+							<greatestDifference id="a">h:mm a – h:mm a v</greatestDifference>
+							<greatestDifference id="h">h:mm–h:mm a v</greatestDifference>
+							<greatestDifference id="m">h:mm–h:mm a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hmv">
+							<greatestDifference id="H">HH:mm–HH:mm v</greatestDifference>
+							<greatestDifference id="m">HH:mm–HH:mm v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="hv">
-							<greatestDifference id="a">HH-HH v</greatestDifference>
-							<greatestDifference id="h">HH-HH v</greatestDifference>
+							<greatestDifference id="a">h a – h a v</greatestDifference>
+							<greatestDifference id="h">h–h a v</greatestDifference>
+						</intervalFormatItem>
+						<intervalFormatItem id="Hv">
+							<greatestDifference id="H">HH–HH v</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="M">
-							<greatestDifference id="M">M-M</greatestDifference>
+							<greatestDifference id="M">MM–MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="Md">
-							<greatestDifference id="d">MM-dd – dd</greatestDifference>
+							<greatestDifference id="d">MM-dd – MM-dd</greatestDifference>
 							<greatestDifference id="M">MM-dd – MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MEd">
-							<greatestDifference id="d">E, MM-dd – E, MM-dd</greatestDifference>
-							<greatestDifference id="M">E, MM-dd – E, MM-dd</greatestDifference>
+							<greatestDifference id="d">MM-dd, E – MM-dd, E</greatestDifference>
+							<greatestDifference id="M">MM-dd, E – MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMM">
-							<greatestDifference id="M">LLL-LLL</greatestDifference>
+							<greatestDifference id="M">LLL–LLL</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMd">
-							<greatestDifference id="d">MM-d – d</greatestDifference>
-							<greatestDifference id="M">MM-d – MM-d</greatestDifference>
+							<greatestDifference id="d">MMM d–d</greatestDifference>
+							<greatestDifference id="M">MMM d – MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="MMMEd">
-							<greatestDifference id="d">E, MM-d – E, MM-d</greatestDifference>
-							<greatestDifference id="M">E, MM-d – E, MM-d</greatestDifference>
-						</intervalFormatItem>
-						<intervalFormatItem id="MMMM">
-							<greatestDifference id="M">LLLL-LLLL</greatestDifference>
+							<greatestDifference id="d">MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">MMM d, E – MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="y">
-							<greatestDifference id="y">y-y</greatestDifference>
+							<greatestDifference id="y">y–y</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
+							<greatestDifference id="M">y-MM – y-MM</greatestDifference>
+							<greatestDifference id="y">y-MM – y-MM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMd">
-							<greatestDifference id="d">yyyy-MM-dd – dd</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd – MM-dd</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd – yyyy-MM-dd</greatestDifference>
+							<greatestDifference id="d">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="M">y-MM-dd – y-MM-dd</greatestDifference>
+							<greatestDifference id="y">y-MM-dd – y-MM-dd</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
+							<greatestDifference id="d">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="M">y-MM-dd, E – y-MM-dd, E</greatestDifference>
+							<greatestDifference id="y">y-MM-dd, E – y-MM-dd, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
+							<greatestDifference id="M">y MMM–MMM</greatestDifference>
+							<greatestDifference id="y">y MMM – y MMM</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMd">
-							<greatestDifference id="d">yyyy-MM-d – d</greatestDifference>
-							<greatestDifference id="M">yyyy-MM-dd – MM-d</greatestDifference>
-							<greatestDifference id="y">yyyy-MM-dd – yyyy-MM-dd</greatestDifference>
+							<greatestDifference id="d">y MMM d–d</greatestDifference>
+							<greatestDifference id="M">y MMM d – MMM d</greatestDifference>
+							<greatestDifference id="y">y MMM d – y MMM d</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMEd">
-							<greatestDifference id="d">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="M">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
-							<greatestDifference id="y">E, yyyy-MM-dd – E, yyyy-MM-dd</greatestDifference>
+							<greatestDifference id="d">y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="M">y MMM d, E – MMM d, E</greatestDifference>
+							<greatestDifference id="y">y MMM d, E – y MMM d, E</greatestDifference>
 						</intervalFormatItem>
 						<intervalFormatItem id="yMMMM">
-							<greatestDifference id="M">yyyy-MM – MM</greatestDifference>
-							<greatestDifference id="y">yyyy-MM – yyyy-MM</greatestDifference>
+							<greatestDifference id="M">y MMMM–MMMM</greatestDifference>
+							<greatestDifference id="y">y MMMM – y MMMM</greatestDifference>
 						</intervalFormatItem>
 					</intervalFormats>
 				</dateTimeFormats>
-				<fields>
-					<field type="era">
-						<displayName>Era</displayName>
-					</field>
-					<field type="year">
-						<displayName>Year</displayName>
-					</field>
-					<field type="month">
-						<displayName>Month</displayName>
-					</field>
-					<field type="week">
-						<displayName>Week</displayName>
-					</field>
-					<field type="day">
-						<displayName>Day</displayName>
-						<relative type="-1">Yesterday</relative>
-						<relative type="0">Today</relative>
-						<relative type="1">Tomorrow</relative>
-					</field>
-					<field type="weekday">
-						<displayName>Day of the Week</displayName>
-					</field>
-					<field type="dayperiod">
-						<displayName>Dayperiod</displayName>
-					</field>
-					<field type="hour">
-						<displayName>Hour</displayName>
-					</field>
-					<field type="minute">
-						<displayName>Minute</displayName>
-					</field>
-					<field type="second">
-						<displayName>Second</displayName>
-					</field>
-					<field type="zone">
-						<displayName>Zone</displayName>
-					</field>
-				</fields>
 			</calendar>
 			<calendar type="hebrew">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -811,6 +1339,7 @@
 							<month type="5">Shevat</month>
 							<month type="6">Adar I</month>
 							<month type="7">Adar</month>
+							<month type="7" yeartype="leap">Adar II</month>
 							<month type="8">Nisan</month>
 							<month type="9">Iyar</month>
 							<month type="10">Sivan</month>
@@ -831,6 +1360,7 @@
 							<month type="5">5</month>
 							<month type="6">6</month>
 							<month type="7">7</month>
+							<month type="7" yeartype="leap">7</month>
 							<month type="8">8</month>
 							<month type="9">9</month>
 							<month type="10">10</month>
@@ -849,34 +1379,36 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">AM</era>
+						<!-- HY = Anno Mundi
+							 = -180799862400000 milliseconds since 1/1/1970 AD
+						-->
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="indian">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -927,36 +1459,46 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">SAKA</era>
+						<era type="0">Saka</era>
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="islamic">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
-							<alias source="locale" path="../monthWidth[@type='wide']"/>
+							<month type="1">Muh.</month>
+							<month type="2">Saf.</month>
+							<month type="3">Rab. I</month>
+							<month type="4">Rab. II</month>
+							<month type="5">Jum. I</month>
+							<month type="6">Jum. II</month>
+							<month type="7">Raj.</month>
+							<month type="8">Sha.</month>
+							<month type="9">Ram.</month>
+							<month type="10">Shaw.</month>
+							<month type="11">Dhuʻl-Q.</month>
+							<month type="12">Dhuʻl-H.</month>
 						</monthWidth>
 						<monthWidth type="narrow">
 							<alias source="locale" path="../../monthContext[@type='stand-alone']/monthWidth[@type='narrow']"/>
@@ -1005,31 +1547,136 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
 						<era type="0">AH</era>
+						<!-- Anno Hijri, = 7/16/622 AD
+							 = -42521587200000.0 millis since 1/1/1970
+						-->
 					</eraAbbr>
 					<eraNarrow>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="islamic-civil">
-				<alias source="locale" path="../calendar[@type='islamic']"/>
+				<months>
+					<alias source="locale" path="../../calendar[@type='islamic']/months"/>
+				</months>
+				<days>
+					<alias source="locale" path="../../calendar[@type='islamic']/days"/>
+				</days>
+				<quarters>
+					<alias source="locale" path="../../calendar[@type='islamic']/quarters"/>
+				</quarters>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='islamic']/dayPeriods"/>
+				</dayPeriods>
+				<eras>
+					<alias source="locale" path="../../calendar[@type='islamic']/eras"/>
+				</eras>
+				<dateFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateFormats"/>
+				</dateFormats>
+				<timeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/timeFormats"/>
+				</timeFormats>
+				<dateTimeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateTimeFormats"/>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="islamic-rgsa">
+				<months>
+					<alias source="locale" path="../../calendar[@type='islamic']/months"/>
+				</months>
+				<days>
+					<alias source="locale" path="../../calendar[@type='islamic']/days"/>
+				</days>
+				<quarters>
+					<alias source="locale" path="../../calendar[@type='islamic']/quarters"/>
+				</quarters>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='islamic']/dayPeriods"/>
+				</dayPeriods>
+				<eras>
+					<alias source="locale" path="../../calendar[@type='islamic']/eras"/>
+				</eras>
+				<dateFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateFormats"/>
+				</dateFormats>
+				<timeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/timeFormats"/>
+				</timeFormats>
+				<dateTimeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateTimeFormats"/>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="islamic-tbla">
+				<months>
+					<alias source="locale" path="../../calendar[@type='islamic']/months"/>
+				</months>
+				<days>
+					<alias source="locale" path="../../calendar[@type='islamic']/days"/>
+				</days>
+				<quarters>
+					<alias source="locale" path="../../calendar[@type='islamic']/quarters"/>
+				</quarters>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='islamic']/dayPeriods"/>
+				</dayPeriods>
+				<eras>
+					<alias source="locale" path="../../calendar[@type='islamic']/eras"/>
+				</eras>
+				<dateFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateFormats"/>
+				</dateFormats>
+				<timeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/timeFormats"/>
+				</timeFormats>
+				<dateTimeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateTimeFormats"/>
+				</dateTimeFormats>
+			</calendar>
+			<calendar type="islamic-umalqura">
+				<months>
+					<alias source="locale" path="../../calendar[@type='islamic']/months"/>
+				</months>
+				<days>
+					<alias source="locale" path="../../calendar[@type='islamic']/days"/>
+				</days>
+				<quarters>
+					<alias source="locale" path="../../calendar[@type='islamic']/quarters"/>
+				</quarters>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='islamic']/dayPeriods"/>
+				</dayPeriods>
+				<eras>
+					<alias source="locale" path="../../calendar[@type='islamic']/eras"/>
+				</eras>
+				<dateFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateFormats"/>
+				</dateFormats>
+				<timeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/timeFormats"/>
+				</timeFormats>
+				<dateTimeFormats>
+					<alias source="locale" path="../../calendar[@type='islamic']/dateTimeFormats"/>
+				</dateTimeFormats>
 			</calendar>
 			<calendar type="japanese">
 				<months>
@@ -1041,251 +1688,488 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
 					<eraAbbr>
-						<era type="0">Taika</era>
-						<era type="1">Hakuchi</era>
-						<era type="2">Hakuhō</era>
-						<era type="3">Shuchō</era>
-						<era type="4">Taihō</era>
-						<era type="5">Keiun</era>
-						<era type="6">Wadō</era>
-						<era type="7">Reiki</era>
-						<era type="8">Yōrō</era>
-						<era type="9">Jinki</era>
-						<era type="10">Tempyō</era>
-						<era type="11">Tempyō-kampō</era>
-						<era type="12">Tempyō-shōhō</era>
-						<era type="13">Tempyō-hōji</era>
-						<era type="14">Temphō-jingo</era>
-						<era type="15">Jingo-keiun</era>
-						<era type="16">Hōki</era>
-						<era type="17">Ten-ō</era>
-						<era type="18">Enryaku</era>
-						<era type="19">Daidō</era>
-						<era type="20">Kōnin</era>
-						<era type="21">Tenchō</era>
-						<era type="22">Shōwa</era>
-						<era type="23">Kajō</era>
-						<era type="24">Ninju</era>
-						<era type="25">Saiko</era>
-						<era type="26">Tennan</era>
-						<era type="27">Jōgan</era>
-						<era type="28">Genkei</era>
-						<era type="29">Ninna</era>
-						<era type="30">Kampyō</era>
-						<era type="31">Shōtai</era>
-						<era type="32">Engi</era>
-						<era type="33">Enchō</era>
-						<era type="34">Shōhei</era>
-						<era type="35">Tengyō</era>
-						<era type="36">Tenryaku</era>
-						<era type="37">Tentoku</era>
-						<era type="38">Ōwa</era>
-						<era type="39">Kōhō</era>
-						<era type="40">Anna</era>
-						<era type="41">Tenroku</era>
-						<era type="42">Ten-en</era>
-						<era type="43">Jōgen</era>
-						<era type="44">Tengen</era>
-						<era type="45">Eikan</era>
-						<era type="46">Kanna</era>
-						<era type="47">Ei-en</era>
-						<era type="48">Eiso</era>
-						<era type="49">Shōryaku</era>
-						<era type="50">Chōtoku</era>
-						<era type="51">Chōhō</era>
-						<era type="52">Kankō</era>
-						<era type="53">Chōwa</era>
-						<era type="54">Kannin</era>
-						<era type="55">Jian</era>
-						<era type="56">Manju</era>
-						<era type="57">Chōgen</era>
-						<era type="58">Chōryaku</era>
-						<era type="59">Chōkyū</era>
-						<era type="60">Kantoku</era>
-						<era type="61">Eishō</era>
-						<era type="62">Tengi</era>
-						<era type="63">Kōhei</era>
-						<era type="64">Jiryaku</era>
-						<era type="65">Enkyū</era>
-						<era type="66">Shōho</era>
-						<era type="67">Shōryaku</era>
-						<era type="68">Eiho</era>
-						<era type="69">Ōtoku</era>
-						<era type="70">Kanji</era>
-						<era type="71">Kaho</era>
-						<era type="72">Eichō</era>
-						<era type="73">Shōtoku</era>
-						<era type="74">Kōwa</era>
-						<era type="75">Chōji</era>
-						<era type="76">Kashō</era>
-						<era type="77">Tennin</era>
-						<era type="78">Ten-ei</era>
-						<era type="79">Eikyū</era>
-						<era type="80">Gen-ei</era>
-						<era type="81">Hoan</era>
-						<era type="82">Tenji</era>
-						<era type="83">Daiji</era>
-						<era type="84">Tenshō</era>
-						<era type="85">Chōshō</era>
-						<era type="86">Hoen</era>
-						<era type="87">Eiji</era>
-						<era type="88">Kōji</era>
-						<era type="89">Tenyō</era>
-						<era type="90">Kyūan</era>
-						<era type="91">Ninpei</era>
-						<era type="92">Kyūju</era>
-						<era type="93">Hogen</era>
-						<era type="94">Heiji</era>
-						<era type="95">Eiryaku</era>
-						<era type="96">Ōho</era>
-						<era type="97">Chōkan</era>
-						<era type="98">Eiman</era>
-						<era type="99">Nin-an</era>
-						<era type="100">Kaō</era>
-						<era type="101">Shōan</era>
-						<era type="102">Angen</era>
-						<era type="103">Jishō</era>
-						<era type="104">Yōwa</era>
-						<era type="105">Juei</era>
-						<era type="106">Genryuku</era>
-						<era type="107">Bunji</era>
-						<era type="108">Kenkyū</era>
-						<era type="109">Shōji</era>
-						<era type="110">Kennin</era>
-						<era type="111">Genkyū</era>
-						<era type="112">Ken-ei</era>
-						<era type="113">Shōgen</era>
-						<era type="114">Kenryaku</era>
-						<era type="115">Kenpō</era>
-						<era type="116">Shōkyū</era>
-						<era type="117">Jōō</era>
-						<era type="118">Gennin</era>
-						<era type="119">Karoku</era>
-						<era type="120">Antei</era>
-						<era type="121">Kanki</era>
-						<era type="122">Jōei</era>
-						<era type="123">Tempuku</era>
-						<era type="124">Bunryaku</era>
-						<era type="125">Katei</era>
-						<era type="126">Ryakunin</era>
-						<era type="127">En-ō</era>
-						<era type="128">Ninji</era>
-						<era type="129">Kangen</era>
-						<era type="130">Hōji</era>
-						<era type="131">Kenchō</era>
-						<era type="132">Kōgen</era>
-						<era type="133">Shōka</era>
-						<era type="134">Shōgen</era>
-						<era type="135">Bun-ō</era>
-						<era type="136">Kōchō</era>
-						<era type="137">Bun-ei</era>
-						<era type="138">Kenji</era>
-						<era type="139">Kōan</era>
-						<era type="140">Shōō</era>
-						<era type="141">Einin</era>
-						<era type="142">Shōan</era>
-						<era type="143">Kengen</era>
-						<era type="144">Kagen</era>
-						<era type="145">Tokuji</era>
-						<era type="146">Enkei</era>
-						<era type="147">Ōchō</era>
-						<era type="148">Shōwa</era>
-						<era type="149">Bunpō</era>
-						<era type="150">Genō</era>
-						<era type="151">Genkyō</era>
-						<era type="152">Shōchū</era>
-						<era type="153">Kareki</era>
-						<era type="154">Gentoku</era>
-						<era type="155">Genkō</era>
-						<era type="156">Kemmu</era>
-						<era type="157">Engen</era>
-						<era type="158">Kōkoku</era>
-						<era type="159">Shōhei</era>
-						<era type="160">Kentoku</era>
-						<era type="161">Bunchũ</era>
-						<era type="162">Tenju</era>
-						<era type="163">Kōryaku</era>
-						<era type="164">Kōwa</era>
-						<era type="165">Genchũ</era>
-						<era type="166">Meitoku</era>
-						<era type="167">Kakei</era>
-						<era type="168">Kōō</era>
-						<era type="169">Meitoku</era>
-						<era type="170">Ōei</era>
-						<era type="171">Shōchō</era>
-						<era type="172">Eikyō</era>
-						<era type="173">Kakitsu</era>
-						<era type="174">Bun-an</era>
-						<era type="175">Hōtoku</era>
-						<era type="176">Kyōtoku</era>
-						<era type="177">Kōshō</era>
-						<era type="178">Chōroku</era>
-						<era type="179">Kanshō</era>
-						<era type="180">Bunshō</era>
-						<era type="181">Ōnin</era>
-						<era type="182">Bunmei</era>
-						<era type="183">Chōkyō</era>
-						<era type="184">Entoku</era>
-						<era type="185">Meiō</era>
-						<era type="186">Bunki</era>
-						<era type="187">Eishō</era>
-						<era type="188">Taiei</era>
-						<era type="189">Kyōroku</era>
-						<era type="190">Tenmon</era>
-						<era type="191">Kōji</era>
-						<era type="192">Eiroku</era>
-						<era type="193">Genki</era>
-						<era type="194">Tenshō</era>
-						<era type="195">Bunroku</era>
-						<era type="196">Keichō</era>
-						<era type="197">Genwa</era>
-						<era type="198">Kan-ei</era>
-						<era type="199">Shōho</era>
-						<era type="200">Keian</era>
-						<era type="201">Shōō</era>
-						<era type="202">Meiryaku</era>
-						<era type="203">Manji</era>
-						<era type="204">Kanbun</era>
-						<era type="205">Enpō</era>
-						<era type="206">Tenwa</era>
-						<era type="207">Jōkyō</era>
-						<era type="208">Genroku</era>
-						<era type="209">Hōei</era>
-						<era type="210">Shōtoku</era>
-						<era type="211">Kyōhō</era>
-						<era type="212">Genbun</era>
-						<era type="213">Kanpō</era>
-						<era type="214">Enkyō</era>
-						<era type="215">Kan-en</era>
-						<era type="216">Hōryaku</era>
-						<era type="217">Meiwa</era>
-						<era type="218">An-ei</era>
-						<era type="219">Tenmei</era>
-						<era type="220">Kansei</era>
-						<era type="221">Kyōwa</era>
-						<era type="222">Bunka</era>
-						<era type="223">Bunsei</era>
-						<era type="224">Tenpō</era>
-						<era type="225">Kōka</era>
-						<era type="226">Kaei</era>
-						<era type="227">Ansei</era>
-						<era type="228">Man-en</era>
-						<era type="229">Bunkyū</era>
-						<era type="230">Genji</era>
-						<era type="231">Keiō</era>
+						<!-- These eras are numbered according to the data used
+							 by the ICU Japanese Calendar.
+							 search for 'ERAS ='
+						-->
+						<era type="0">Taika (645-650)</era>
+						<era type="1">Hakuchi (650-671)</era>
+						<era type="2">Hakuhō (672-686)</era>
+						<era type="3">Shuchō (686-701)</era>
+						<era type="4">Taihō (701-704)</era>
+						<era type="5">Keiun (704-708)</era>
+						<era type="6">Wadō (708-715)</era>
+						<era type="7">Reiki (715-717)</era>
+						<era type="8">Yōrō (717-724)</era>
+						<era type="9">Jinki (724-729)</era>
+						<era type="10">Tempyō (729-749)</era>
+						<era type="11">Tempyō-kampō (749-749)</era>
+						<era type="12">Tempyō-shōhō (749-757)</era>
+						<era type="13">Tempyō-hōji (757-765)</era>
+						<era type="14">Temphō-jingo (765-767)</era>
+						<era type="15">Jingo-keiun (767-770)</era>
+						<era type="16">Hōki (770-780)</era>
+						<era type="17">Ten-ō (781-782)</era>
+						<era type="18">Enryaku (782-806)</era>
+						<era type="19">Daidō (806-810)</era>
+						<era type="20">Kōnin (810-824)</era>
+						<era type="21">Tenchō (824-834)</era>
+						<era type="22">Jōwa (834-848)</era>
+						<era type="23">Kajō (848-851)</era>
+						<era type="24">Ninju (851-854)</era>
+						<era type="25">Saiko (854-857)</era>
+						<era type="26">Tennan (857-859)</era>
+						<era type="27">Jōgan (859-877)</era>
+						<era type="28">Genkei (877-885)</era>
+						<era type="29">Ninna (885-889)</era>
+						<era type="30">Kampyō (889-898)</era>
+						<era type="31">Shōtai (898-901)</era>
+						<era type="32">Engi (901-923)</era>
+						<era type="33">Enchō (923-931)</era>
+						<era type="34">Shōhei (931-938)</era>
+						<era type="35">Tengyō (938-947)</era>
+						<era type="36">Tenryaku (947-957)</era>
+						<era type="37">Tentoku (957-961)</era>
+						<era type="38">Ōwa (961-964)</era>
+						<era type="39">Kōhō (964-968)</era>
+						<era type="40">Anna (968-970)</era>
+						<era type="41">Tenroku (970-973)</era>
+						<era type="42">Ten-en (973-976)</era>
+						<era type="43">Jōgen (976-978)</era>
+						<era type="44">Tengen (978-983)</era>
+						<era type="45">Eikan (983-985)</era>
+						<era type="46">Kanna (985-987)</era>
+						<era type="47">Ei-en (987-989)</era>
+						<era type="48">Eiso (989-990)</era>
+						<era type="49">Shōryaku (990-995)</era>
+						<era type="50">Chōtoku (995-999)</era>
+						<era type="51">Chōhō (999-1004)</era>
+						<era type="52">Kankō (1004-1012)</era>
+						<era type="53">Chōwa (1012-1017)</era>
+						<era type="54">Kannin (1017-1021)</era>
+						<era type="55">Jian (1021-1024)</era>
+						<era type="56">Manju (1024-1028)</era>
+						<era type="57">Chōgen (1028-1037)</era>
+						<era type="58">Chōryaku (1037-1040)</era>
+						<era type="59">Chōkyū (1040-1044)</era>
+						<era type="60">Kantoku (1044-1046)</era>
+						<era type="61">Eishō (1046-1053)</era>
+						<era type="62">Tengi (1053-1058)</era>
+						<era type="63">Kōhei (1058-1065)</era>
+						<era type="64">Jiryaku (1065-1069)</era>
+						<era type="65">Enkyū (1069-1074)</era>
+						<era type="66">Shōho (1074-1077)</era>
+						<era type="67">Shōryaku (1077-1081)</era>
+						<era type="68">Eiho (1081-1084)</era>
+						<era type="69">Ōtoku (1084-1087)</era>
+						<era type="70">Kanji (1087-1094)</era>
+						<era type="71">Kaho (1094-1096)</era>
+						<era type="72">Eichō (1096-1097)</era>
+						<era type="73">Shōtoku (1097-1099)</era>
+						<era type="74">Kōwa (1099-1104)</era>
+						<era type="75">Chōji (1104-1106)</era>
+						<era type="76">Kashō (1106-1108)</era>
+						<era type="77">Tennin (1108-1110)</era>
+						<era type="78">Ten-ei (1110-1113)</era>
+						<era type="79">Eikyū (1113-1118)</era>
+						<era type="80">Gen-ei (1118-1120)</era>
+						<era type="81">Hoan (1120-1124)</era>
+						<era type="82">Tenji (1124-1126)</era>
+						<era type="83">Daiji (1126-1131)</era>
+						<era type="84">Tenshō (1131-1132)</era>
+						<era type="85">Chōshō (1132-1135)</era>
+						<era type="86">Hoen (1135-1141)</era>
+						<era type="87">Eiji (1141-1142)</era>
+						<era type="88">Kōji (1142-1144)</era>
+						<era type="89">Tenyō (1144-1145)</era>
+						<era type="90">Kyūan (1145-1151)</era>
+						<era type="91">Ninpei (1151-1154)</era>
+						<era type="92">Kyūju (1154-1156)</era>
+						<era type="93">Hogen (1156-1159)</era>
+						<era type="94">Heiji (1159-1160)</era>
+						<era type="95">Eiryaku (1160-1161)</era>
+						<era type="96">Ōho (1161-1163)</era>
+						<era type="97">Chōkan (1163-1165)</era>
+						<era type="98">Eiman (1165-1166)</era>
+						<era type="99">Nin-an (1166-1169)</era>
+						<era type="100">Kaō (1169-1171)</era>
+						<era type="101">Shōan (1171-1175)</era>
+						<era type="102">Angen (1175-1177)</era>
+						<era type="103">Jishō (1177-1181)</era>
+						<era type="104">Yōwa (1181-1182)</era>
+						<era type="105">Juei (1182-1184)</era>
+						<era type="106">Genryuku (1184-1185)</era>
+						<era type="107">Bunji (1185-1190)</era>
+						<era type="108">Kenkyū (1190-1199)</era>
+						<era type="109">Shōji (1199-1201)</era>
+						<era type="110">Kennin (1201-1204)</era>
+						<era type="111">Genkyū (1204-1206)</era>
+						<era type="112">Ken-ei (1206-1207)</era>
+						<era type="113">Shōgen (1207-1211)</era>
+						<era type="114">Kenryaku (1211-1213)</era>
+						<era type="115">Kenpō (1213-1219)</era>
+						<era type="116">Shōkyū (1219-1222)</era>
+						<era type="117">Jōō (1222-1224)</era>
+						<era type="118">Gennin (1224-1225)</era>
+						<era type="119">Karoku (1225-1227)</era>
+						<era type="120">Antei (1227-1229)</era>
+						<era type="121">Kanki (1229-1232)</era>
+						<era type="122">Jōei (1232-1233)</era>
+						<era type="123">Tempuku (1233-1234)</era>
+						<era type="124">Bunryaku (1234-1235)</era>
+						<era type="125">Katei (1235-1238)</era>
+						<era type="126">Ryakunin (1238-1239)</era>
+						<era type="127">En-ō (1239-1240)</era>
+						<era type="128">Ninji (1240-1243)</era>
+						<era type="129">Kangen (1243-1247)</era>
+						<era type="130">Hōji (1247-1249)</era>
+						<era type="131">Kenchō (1249-1256)</era>
+						<era type="132">Kōgen (1256-1257)</era>
+						<era type="133">Shōka (1257-1259)</era>
+						<era type="134">Shōgen (1259-1260)</era>
+						<era type="135">Bun-ō (1260-1261)</era>
+						<era type="136">Kōchō (1261-1264)</era>
+						<era type="137">Bun-ei (1264-1275)</era>
+						<era type="138">Kenji (1275-1278)</era>
+						<era type="139">Kōan (1278-1288)</era>
+						<era type="140">Shōō (1288-1293)</era>
+						<era type="141">Einin (1293-1299)</era>
+						<era type="142">Shōan (1299-1302)</era>
+						<era type="143">Kengen (1302-1303)</era>
+						<era type="144">Kagen (1303-1306)</era>
+						<era type="145">Tokuji (1306-1308)</era>
+						<era type="146">Enkei (1308-1311)</era>
+						<era type="147">Ōchō (1311-1312)</era>
+						<era type="148">Shōwa (1312-1317)</era>
+						<era type="149">Bunpō (1317-1319)</era>
+						<era type="150">Genō (1319-1321)</era>
+						<era type="151">Genkyō (1321-1324)</era>
+						<era type="152">Shōchū (1324-1326)</era>
+						<era type="153">Kareki (1326-1329)</era>
+						<era type="154">Gentoku (1329-1331)</era>
+						<era type="155">Genkō (1331-1334)</era>
+						<era type="156">Kemmu (1334-1336)</era>
+						<era type="157">Engen (1336-1340)</era>
+						<era type="158">Kōkoku (1340-1346)</era>
+						<era type="159">Shōhei (1346-1370)</era>
+						<era type="160">Kentoku (1370-1372)</era>
+						<era type="161">Bunchū (1372-1375)</era>
+						<era type="162">Tenju (1375-1379)</era>
+						<era type="163">Kōryaku (1379-1381)</era>
+						<era type="164">Kōwa (1381-1384)</era>
+						<era type="165">Genchū (1384-1392)</era>
+						<era type="166">Meitoku (1384-1387)</era>
+						<era type="167">Kakei (1387-1389)</era>
+						<era type="168">Kōō (1389-1390)</era>
+						<era type="169">Meitoku (1390-1394)</era>
+						<era type="170">Ōei (1394-1428)</era>
+						<era type="171">Shōchō (1428-1429)</era>
+						<era type="172">Eikyō (1429-1441)</era>
+						<era type="173">Kakitsu (1441-1444)</era>
+						<era type="174">Bun-an (1444-1449)</era>
+						<era type="175">Hōtoku (1449-1452)</era>
+						<era type="176">Kyōtoku (1452-1455)</era>
+						<era type="177">Kōshō (1455-1457)</era>
+						<era type="178">Chōroku (1457-1460)</era>
+						<era type="179">Kanshō (1460-1466)</era>
+						<era type="180">Bunshō (1466-1467)</era>
+						<era type="181">Ōnin (1467-1469)</era>
+						<era type="182">Bunmei (1469-1487)</era>
+						<era type="183">Chōkyō (1487-1489)</era>
+						<era type="184">Entoku (1489-1492)</era>
+						<era type="185">Meiō (1492-1501)</era>
+						<era type="186">Bunki (1501-1504)</era>
+						<era type="187">Eishō (1504-1521)</era>
+						<era type="188">Taiei (1521-1528)</era>
+						<era type="189">Kyōroku (1528-1532)</era>
+						<era type="190">Tenmon (1532-1555)</era>
+						<era type="191">Kōji (1555-1558)</era>
+						<era type="192">Eiroku (1558-1570)</era>
+						<era type="193">Genki (1570-1573)</era>
+						<era type="194">Tenshō (1573-1592)</era>
+						<era type="195">Bunroku (1592-1596)</era>
+						<era type="196">Keichō (1596-1615)</era>
+						<era type="197">Genwa (1615-1624)</era>
+						<era type="198">Kan-ei (1624-1644)</era>
+						<era type="199">Shōho (1644-1648)</era>
+						<era type="200">Keian (1648-1652)</era>
+						<era type="201">Shōō (1652-1655)</era>
+						<era type="202">Meiryaku (1655-1658)</era>
+						<era type="203">Manji (1658-1661)</era>
+						<era type="204">Kanbun (1661-1673)</era>
+						<era type="205">Enpō (1673-1681)</era>
+						<era type="206">Tenwa (1681-1684)</era>
+						<era type="207">Jōkyō (1684-1688)</era>
+						<era type="208">Genroku (1688-1704)</era>
+						<era type="209">Hōei (1704-1711)</era>
+						<era type="210">Shōtoku (1711-1716)</era>
+						<era type="211">Kyōhō (1716-1736)</era>
+						<era type="212">Genbun (1736-1741)</era>
+						<era type="213">Kanpō (1741-1744)</era>
+						<era type="214">Enkyō (1744-1748)</era>
+						<era type="215">Kan-en (1748-1751)</era>
+						<era type="216">Hōryaku (1751-1764)</era>
+						<era type="217">Meiwa (1764-1772)</era>
+						<era type="218">An-ei (1772-1781)</era>
+						<era type="219">Tenmei (1781-1789)</era>
+						<era type="220">Kansei (1789-1801)</era>
+						<era type="221">Kyōwa (1801-1804)</era>
+						<era type="222">Bunka (1804-1818)</era>
+						<era type="223">Bunsei (1818-1830)</era>
+						<era type="224">Tenpō (1830-1844)</era>
+						<era type="225">Kōka (1844-1848)</era>
+						<era type="226">Kaei (1848-1854)</era>
+						<era type="227">Ansei (1854-1860)</era>
+						<era type="228">Man-en (1860-1861)</era>
+						<era type="229">Bunkyū (1861-1864)</era>
+						<era type="230">Genji (1864-1865)</era>
+						<era type="231">Keiō (1865-1868)</era>
 						<era type="232">Meiji</era>
 						<era type="233">Taishō</era>
 						<era type="234">Shōwa</era>
 						<era type="235">Heisei</era>
 					</eraAbbr>
 					<eraNarrow>
+						<era type="0">Taika (645-650)</era>
+						<era type="1">Hakuchi (650-671)</era>
+						<era type="2">Hakuhō (672-686)</era>
+						<era type="3">Shuchō (686-701)</era>
+						<era type="4">Taihō (701-704)</era>
+						<era type="5">Keiun (704-708)</era>
+						<era type="6">Wadō (708-715)</era>
+						<era type="7">Reiki (715-717)</era>
+						<era type="8">Yōrō (717-724)</era>
+						<era type="9">Jinki (724-729)</era>
+						<era type="10">Tempyō (729-749)</era>
+						<era type="11">Tempyō-kampō (749-749)</era>
+						<era type="12">Tempyō-shōhō (749-757)</era>
+						<era type="13">Tempyō-hōji (757-765)</era>
+						<era type="14">Temphō-jingo (765-767)</era>
+						<era type="15">Jingo-keiun (767-770)</era>
+						<era type="16">Hōki (770-780)</era>
+						<era type="17">Ten-ō (781-782)</era>
+						<era type="18">Enryaku (782-806)</era>
+						<era type="19">Daidō (806-810)</era>
+						<era type="20">Kōnin (810-824)</era>
+						<era type="21">Tenchō (824-834)</era>
+						<era type="22">Jōwa (834-848)</era>
+						<era type="23">Kajō (848-851)</era>
+						<era type="24">Ninju (851-854)</era>
+						<era type="25">Saiko (854-857)</era>
+						<era type="26">Tennan (857-859)</era>
+						<era type="27">Jōgan (859-877)</era>
+						<era type="28">Genkei (877-885)</era>
+						<era type="29">Ninna (885-889)</era>
+						<era type="30">Kampyō (889-898)</era>
+						<era type="31">Shōtai (898-901)</era>
+						<era type="32">Engi (901-923)</era>
+						<era type="33">Enchō (923-931)</era>
+						<era type="34">Shōhei (931-938)</era>
+						<era type="35">Tengyō (938-947)</era>
+						<era type="36">Tenryaku (947-957)</era>
+						<era type="37">Tentoku (957-961)</era>
+						<era type="38">Ōwa (961-964)</era>
+						<era type="39">Kōhō (964-968)</era>
+						<era type="40">Anna (968-970)</era>
+						<era type="41">Tenroku (970-973)</era>
+						<era type="42">Ten-en (973-976)</era>
+						<era type="43">Jōgen (976-978)</era>
+						<era type="44">Tengen (978-983)</era>
+						<era type="45">Eikan (983-985)</era>
+						<era type="46">Kanna (985-987)</era>
+						<era type="47">Ei-en (987-989)</era>
+						<era type="48">Eiso (989-990)</era>
+						<era type="49">Shōryaku (990-995)</era>
+						<era type="50">Chōtoku (995-999)</era>
+						<era type="51">Chōhō (999-1004)</era>
+						<era type="52">Kankō (1004-1012)</era>
+						<era type="53">Chōwa (1012-1017)</era>
+						<era type="54">Kannin (1017-1021)</era>
+						<era type="55">Jian (1021-1024)</era>
+						<era type="56">Manju (1024-1028)</era>
+						<era type="57">Chōgen (1028-1037)</era>
+						<era type="58">Chōryaku (1037-1040)</era>
+						<era type="59">Chōkyū (1040-1044)</era>
+						<era type="60">Kantoku (1044-1046)</era>
+						<era type="61">Eishō (1046-1053)</era>
+						<era type="62">Tengi (1053-1058)</era>
+						<era type="63">Kōhei (1058-1065)</era>
+						<era type="64">Jiryaku (1065-1069)</era>
+						<era type="65">Enkyū (1069-1074)</era>
+						<era type="66">Shōho (1074-1077)</era>
+						<era type="67">Shōryaku (1077-1081)</era>
+						<era type="68">Eiho (1081-1084)</era>
+						<era type="69">Ōtoku (1084-1087)</era>
+						<era type="70">Kanji (1087-1094)</era>
+						<era type="71">Kaho (1094-1096)</era>
+						<era type="72">Eichō (1096-1097)</era>
+						<era type="73">Shōtoku (1097-1099)</era>
+						<era type="74">Kōwa (1099-1104)</era>
+						<era type="75">Chōji (1104-1106)</era>
+						<era type="76">Kashō (1106-1108)</era>
+						<era type="77">Tennin (1108-1110)</era>
+						<era type="78">Ten-ei (1110-1113)</era>
+						<era type="79">Eikyū (1113-1118)</era>
+						<era type="80">Gen-ei (1118-1120)</era>
+						<era type="81">Hoan (1120-1124)</era>
+						<era type="82">Tenji (1124-1126)</era>
+						<era type="83">Daiji (1126-1131)</era>
+						<era type="84">Tenshō (1131-1132)</era>
+						<era type="85">Chōshō (1132-1135)</era>
+						<era type="86">Hoen (1135-1141)</era>
+						<era type="87">Eiji (1141-1142)</era>
+						<era type="88">Kōji (1142-1144)</era>
+						<era type="89">Tenyō (1144-1145)</era>
+						<era type="90">Kyūan (1145-1151)</era>
+						<era type="91">Ninpei (1151-1154)</era>
+						<era type="92">Kyūju (1154-1156)</era>
+						<era type="93">Hogen (1156-1159)</era>
+						<era type="94">Heiji (1159-1160)</era>
+						<era type="95">Eiryaku (1160-1161)</era>
+						<era type="96">Ōho (1161-1163)</era>
+						<era type="97">Chōkan (1163-1165)</era>
+						<era type="98">Eiman (1165-1166)</era>
+						<era type="99">Nin-an (1166-1169)</era>
+						<era type="100">Kaō (1169-1171)</era>
+						<era type="101">Shōan (1171-1175)</era>
+						<era type="102">Angen (1175-1177)</era>
+						<era type="103">Jishō (1177-1181)</era>
+						<era type="104">Yōwa (1181-1182)</era>
+						<era type="105">Juei (1182-1184)</era>
+						<era type="106">Genryuku (1184-1185)</era>
+						<era type="107">Bunji (1185-1190)</era>
+						<era type="108">Kenkyū (1190-1199)</era>
+						<era type="109">Shōji (1199-1201)</era>
+						<era type="110">Kennin (1201-1204)</era>
+						<era type="111">Genkyū (1204-1206)</era>
+						<era type="112">Ken-ei (1206-1207)</era>
+						<era type="113">Shōgen (1207-1211)</era>
+						<era type="114">Kenryaku (1211-1213)</era>
+						<era type="115">Kenpō (1213-1219)</era>
+						<era type="116">Shōkyū (1219-1222)</era>
+						<era type="117">Jōō (1222-1224)</era>
+						<era type="118">Gennin (1224-1225)</era>
+						<era type="119">Karoku (1225-1227)</era>
+						<era type="120">Antei (1227-1229)</era>
+						<era type="121">Kanki (1229-1232)</era>
+						<era type="122">Jōei (1232-1233)</era>
+						<era type="123">Tempuku (1233-1234)</era>
+						<era type="124">Bunryaku (1234-1235)</era>
+						<era type="125">Katei (1235-1238)</era>
+						<era type="126">Ryakunin (1238-1239)</era>
+						<era type="127">En-ō (1239-1240)</era>
+						<era type="128">Ninji (1240-1243)</era>
+						<era type="129">Kangen (1243-1247)</era>
+						<era type="130">Hōji (1247-1249)</era>
+						<era type="131">Kenchō (1249-1256)</era>
+						<era type="132">Kōgen (1256-1257)</era>
+						<era type="133">Shōka (1257-1259)</era>
+						<era type="134">Shōgen (1259-1260)</era>
+						<era type="135">Bun-ō (1260-1261)</era>
+						<era type="136">Kōchō (1261-1264)</era>
+						<era type="137">Bun-ei (1264-1275)</era>
+						<era type="138">Kenji (1275-1278)</era>
+						<era type="139">Kōan (1278-1288)</era>
+						<era type="140">Shōō (1288-1293)</era>
+						<era type="141">Einin (1293-1299)</era>
+						<era type="142">Shōan (1299-1302)</era>
+						<era type="143">Kengen (1302-1303)</era>
+						<era type="144">Kagen (1303-1306)</era>
+						<era type="145">Tokuji (1306-1308)</era>
+						<era type="146">Enkei (1308-1311)</era>
+						<era type="147">Ōchō (1311-1312)</era>
+						<era type="148">Shōwa (1312-1317)</era>
+						<era type="149">Bunpō (1317-1319)</era>
+						<era type="150">Genō (1319-1321)</era>
+						<era type="151">Genkyō (1321-1324)</era>
+						<era type="152">Shōchū (1324-1326)</era>
+						<era type="153">Kareki (1326-1329)</era>
+						<era type="154">Gentoku (1329-1331)</era>
+						<era type="155">Genkō (1331-1334)</era>
+						<era type="156">Kemmu (1334-1336)</era>
+						<era type="157">Engen (1336-1340)</era>
+						<era type="158">Kōkoku (1340-1346)</era>
+						<era type="159">Shōhei (1346-1370)</era>
+						<era type="160">Kentoku (1370-1372)</era>
+						<era type="161">Bunchũ (1372-1375)</era>
+						<era type="162">Tenju (1375-1379)</era>
+						<era type="163">Kōryaku (1379-1381)</era>
+						<era type="164">Kōwa (1381-1384)</era>
+						<era type="165">Genchũ (1384-1392)</era>
+						<era type="166">Meitoku (1384-1387)</era>
+						<era type="167">Kakei (1387-1389)</era>
+						<era type="168">Kōō (1389-1390)</era>
+						<era type="169">Meitoku (1390-1394)</era>
+						<era type="170">Ōei (1394-1428)</era>
+						<era type="171">Shōchō (1428-1429)</era>
+						<era type="172">Eikyō (1429-1441)</era>
+						<era type="173">Kakitsu (1441-1444)</era>
+						<era type="174">Bun-an (1444-1449)</era>
+						<era type="175">Hōtoku (1449-1452)</era>
+						<era type="176">Kyōtoku (1452-1455)</era>
+						<era type="177">Kōshō (1455-1457)</era>
+						<era type="178">Chōroku (1457-1460)</era>
+						<era type="179">Kanshō (1460-1466)</era>
+						<era type="180">Bunshō (1466-1467)</era>
+						<era type="181">Ōnin (1467-1469)</era>
+						<era type="182">Bunmei (1469-1487)</era>
+						<era type="183">Chōkyō (1487-1489)</era>
+						<era type="184">Entoku (1489-1492)</era>
+						<era type="185">Meiō (1492-1501)</era>
+						<era type="186">Bunki (1501-1504)</era>
+						<era type="187">Eishō (1504-1521)</era>
+						<era type="188">Taiei (1521-1528)</era>
+						<era type="189">Kyōroku (1528-1532)</era>
+						<era type="190">Tenmon (1532-1555)</era>
+						<era type="191">Kōji (1555-1558)</era>
+						<era type="192">Eiroku (1558-1570)</era>
+						<era type="193">Genki (1570-1573)</era>
+						<era type="194">Tenshō (1573-1592)</era>
+						<era type="195">Bunroku (1592-1596)</era>
+						<era type="196">Keichō (1596-1615)</era>
+						<era type="197">Genwa (1615-1624)</era>
+						<era type="198">Kan-ei (1624-1644)</era>
+						<era type="199">Shōho (1644-1648)</era>
+						<era type="200">Keian (1648-1652)</era>
+						<era type="201">Shōō (1652-1655)</era>
+						<era type="202">Meiryaku (1655-1658)</era>
+						<era type="203">Manji (1658-1661)</era>
+						<era type="204">Kanbun (1661-1673)</era>
+						<era type="205">Enpō (1673-1681)</era>
+						<era type="206">Tenwa (1681-1684)</era>
+						<era type="207">Jōkyō (1684-1688)</era>
+						<era type="208">Genroku (1688-1704)</era>
+						<era type="209">Hōei (1704-1711)</era>
+						<era type="210">Shōtoku (1711-1716)</era>
+						<era type="211">Kyōhō (1716-1736)</era>
+						<era type="212">Genbun (1736-1741)</era>
+						<era type="213">Kanpō (1741-1744)</era>
+						<era type="214">Enkyō (1744-1748)</era>
+						<era type="215">Kan-en (1748-1751)</era>
+						<era type="216">Hōryaku (1751-1764)</era>
+						<era type="217">Meiwa (1764-1772)</era>
+						<era type="218">An-ei (1772-1781)</era>
+						<era type="219">Tenmei (1781-1789)</era>
+						<era type="220">Kansei (1789-1801)</era>
+						<era type="221">Kyōwa (1801-1804)</era>
+						<era type="222">Bunka (1804-1818)</era>
+						<era type="223">Bunsei (1818-1830)</era>
+						<era type="224">Tenpō (1830-1844)</era>
+						<era type="225">Kōka (1844-1848)</era>
+						<era type="226">Kaei (1848-1854)</era>
+						<era type="227">Ansei (1854-1860)</era>
+						<era type="228">Man-en (1860-1861)</era>
+						<era type="229">Bunkyū (1861-1864)</era>
+						<era type="230">Genji (1864-1865)</era>
+						<era type="231">Keiō (1865-1868)</era>
 						<era type="232">M</era>
 						<era type="233">T</era>
 						<era type="234">S</era>
@@ -1293,91 +2177,18 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, G y MMMM dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>G y MMMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>G y MMM d</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>G yy-MM-dd</pattern>
-						</dateFormat>
-					</dateFormatLength>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<default choice="medium"/>
-					<dateTimeFormatLength type="full">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="long">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="medium">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<dateTimeFormatLength type="short">
-						<dateTimeFormat>
-							<pattern>{1} {0}</pattern>
-						</dateTimeFormat>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="Ed">E d</dateFormatItem>
-						<dateFormatItem id="H">H</dateFormatItem>
-						<dateFormatItem id="hm">hh:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">HH:mm</dateFormatItem>
-						<dateFormatItem id="hms">hh:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">HH:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">M-d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E MMM d</dateFormatItem>
-						<dateFormatItem id="MMMMd">MMMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyyy">yy GGG</dateFormatItem>
-						<dateFormatItem id="yyyyM">GGGGG yy-MM</dateFormatItem>
-						<dateFormatItem id="yyyyMd">GGGGG yy-MM-dd</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">GGGGG yy MMM</dateFormatItem>
-						<dateFormatItem id="yyyyMMMd">GGGGG yy MMM d</dateFormatItem>
-						<dateFormatItem id="yyyyQ">GGGGG yy Q</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="persian">
 				<months>
-					<default choice="format"/>
 					<monthContext type="format">
-						<default choice="wide"/>
 						<monthWidth type="abbreviated">
 							<alias source="locale" path="../monthWidth[@type='wide']"/>
 						</monthWidth>
@@ -1428,8 +2239,9 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
@@ -1442,13 +2254,13 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<alias source="locale" path="../../calendar[@type='gregorian']/dateTimeFormats"/>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 			<calendar type="roc">
@@ -1461,12 +2273,14 @@
 				<quarters>
 					<alias source="locale" path="../../calendar[@type='gregorian']/quarters"/>
 				</quarters>
-				<am>AM</am>
-				<pm>PM</pm>
+				<dayPeriods>
+					<alias source="locale" path="../../calendar[@type='gregorian']/dayPeriods"/>
+				</dayPeriods>
 				<eras>
 					<eraNames>
 						<alias source="locale" path="../eraAbbr"/>
 					</eraNames>
+					<!-- = 1912 AD gregorian. See: http://en.wikipedia.org/wiki/Minguo_calendar -->
 					<eraAbbr>
 						<era type="0">Before R.O.C.</era>
 						<era type="1">R.O.C.</era>
@@ -1476,90 +2290,202 @@
 					</eraNarrow>
 				</eras>
 				<dateFormats>
-					<default choice="medium"/>
-					<dateFormatLength type="full">
-						<dateFormat>
-							<pattern>EEEE, MMMM d, G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="long">
-						<dateFormat>
-							<pattern>MMMM d, G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="medium">
-						<dateFormat>
-							<pattern>MMM d, G y</pattern>
-						</dateFormat>
-					</dateFormatLength>
-					<dateFormatLength type="short">
-						<dateFormat>
-							<pattern>G y/M/d</pattern>
-						</dateFormat>
-					</dateFormatLength>
+					<alias source="locale" path="../../calendar[@type='generic']/dateFormats"/>
 				</dateFormats>
 				<timeFormats>
 					<alias source="locale" path="../../calendar[@type='gregorian']/timeFormats"/>
 				</timeFormats>
 				<dateTimeFormats>
-					<dateTimeFormatLength>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/dateTimeFormatLength"/>
-					</dateTimeFormatLength>
-					<availableFormats>
-						<dateFormatItem id="hm">h:mm a</dateFormatItem>
-						<dateFormatItem id="Hm">H:mm</dateFormatItem>
-						<dateFormatItem id="hms">h:mm:ss a</dateFormatItem>
-						<dateFormatItem id="Hms">H:mm:ss</dateFormatItem>
-						<dateFormatItem id="Md">M/d</dateFormatItem>
-						<dateFormatItem id="MEd">E, M/d</dateFormatItem>
-						<dateFormatItem id="MMMd">MMM d</dateFormatItem>
-						<dateFormatItem id="MMMEd">E, MMM d</dateFormatItem>
-						<dateFormatItem id="ms">mm:ss</dateFormatItem>
-						<dateFormatItem id="yyyy">G y</dateFormatItem>
-						<dateFormatItem id="yyyyM">G y/M</dateFormatItem>
-						<dateFormatItem id="yyyyMEd">EEE, G y/M/d</dateFormatItem>
-						<dateFormatItem id="yyyyMMM">MMM, G y</dateFormatItem>
-						<dateFormatItem id="yyyyMMMEd">EEE, MMM d, G y</dateFormatItem>
-						<dateFormatItem id="yyyyQ">Q G y</dateFormatItem>
-						<dateFormatItem id="yyyyQQQ">QQQ G y</dateFormatItem>
-					</availableFormats>
-					<appendItems>
-						<appendItem request="Day">{0} ({2}: {1})</appendItem>
-						<appendItem request="Day-Of-Week">{0} {1}</appendItem>
-						<appendItem request="Era">{0} {1}</appendItem>
-						<appendItem request="Hour">{0} ({2}: {1})</appendItem>
-						<appendItem request="Minute">{0} ({2}: {1})</appendItem>
-						<appendItem request="Month">{0} ({2}: {1})</appendItem>
-						<appendItem request="Quarter">{0} ({2}: {1})</appendItem>
-						<appendItem request="Second">{0} ({2}: {1})</appendItem>
-						<appendItem request="Timezone">{0} {1}</appendItem>
-						<appendItem request="Week">{0} ({2}: {1})</appendItem>
-						<appendItem request="Year">{0} {1}</appendItem>
-					</appendItems>
-					<intervalFormats>
-						<alias source="locale" path="../../../calendar[@type='gregorian']/dateTimeFormats/intervalFormats"/>
-					</intervalFormats>
+					<alias source="locale" path="../../calendar[@type='generic']/dateTimeFormats"/>
 				</dateTimeFormats>
 			</calendar>
 		</calendars>
+		<fields>
+			<field type="era">
+				<displayName>Era</displayName>
+			</field>
+			<field type="year">
+				<displayName>Year</displayName>
+				<relative type="-1">last year</relative>
+				<relative type="0">this year</relative>
+				<relative type="1">next year</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} y</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} y</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="month">
+				<displayName>Month</displayName>
+				<relative type="-1">last month</relative>
+				<relative type="0">this month</relative>
+				<relative type="1">next month</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} m</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} m</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="week">
+				<displayName>Week</displayName>
+				<relative type="-1">last week</relative>
+				<relative type="0">this week</relative>
+				<relative type="1">next week</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} w</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} w</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="day">
+				<displayName>Day</displayName>
+				<relative type="-1">yesterday</relative>
+				<relative type="0">today</relative>
+				<relative type="1">tomorrow</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} d</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} d</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="weekday">
+				<displayName>Day of the Week</displayName>
+			</field>
+			<field type="sun">
+				<relative type="-1">last Sunday</relative>
+				<relative type="0">this Sunday</relative>
+				<relative type="1">next Sunday</relative>
+			</field>
+			<field type="mon">
+				<relative type="-1">last Monday</relative>
+				<relative type="0">this Monday</relative>
+				<relative type="1">next Monday</relative>
+			</field>
+			<field type="tue">
+				<relative type="-1">last Tuesday</relative>
+				<relative type="0">this Tuesday</relative>
+				<relative type="1">next Tuesday</relative>
+			</field>
+			<field type="wed">
+				<relative type="-1">last Wednesday</relative>
+				<relative type="0">this Wednesday</relative>
+				<relative type="1">next Wednesday</relative>
+			</field>
+			<field type="thu">
+				<relative type="-1">last Thursday</relative>
+				<relative type="0">this Thursday</relative>
+				<relative type="1">next Thursday</relative>
+			</field>
+			<field type="fri">
+				<relative type="-1">last Friday</relative>
+				<relative type="0">this Friday</relative>
+				<relative type="1">next Friday</relative>
+			</field>
+			<field type="sat">
+				<relative type="-1">last Saturday</relative>
+				<relative type="0">this Saturday</relative>
+				<relative type="1">next Saturday</relative>
+			</field>
+			<field type="dayperiod">
+				<displayName>Dayperiod</displayName>
+			</field>
+			<field type="hour">
+				<displayName>Hour</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} h</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} h</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="minute">
+				<displayName>Minute</displayName>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} min</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} min</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="second">
+				<displayName>Second</displayName>
+				<relative type="0">now</relative>
+				<relativeTime type="future">
+					<relativeTimePattern count="other">+{0} s</relativeTimePattern>
+				</relativeTime>
+				<relativeTime type="past">
+					<relativeTimePattern count="other">-{0} s</relativeTimePattern>
+				</relativeTime>
+			</field>
+			<field type="zone">
+				<displayName>Zone</displayName>
+			</field>
+		</fields>
 		<timeZoneNames>
 			<hourFormat>+HH:mm;-HH:mm</hourFormat>
-			<hoursFormat>{0}/{1}</hoursFormat>
 			<gmtFormat>GMT{0}</gmtFormat>
 			<gmtZeroFormat>GMT</gmtZeroFormat>
 			<regionFormat>{0}</regionFormat>
+			<regionFormat type="daylight">{0} (+1)</regionFormat>
+			<regionFormat type="standard">{0} (+0)</regionFormat>
 			<fallbackFormat>{1} ({0})</fallbackFormat>
-			<abbreviationFallback choice="standard"/>
-			<preferenceOrdering choice=""/>
-			<singleCountries list="Europe/Kiev Pacific/Majuro Africa/Bamako America/Godthab America/Santiago America/Guayaquil Asia/Shanghai Asia/Tashkent Asia/Kuala_Lumpur Europe/Madrid Europe/Lisbon Europe/London Pacific/Auckland Pacific/Tahiti"/>
 			<zone type="Etc/Unknown">
 				<exemplarCity>Unknown</exemplarCity>
 			</zone>
 			<zone type="Antarctica/DumontDUrville">
-				<exemplarCity>Dumont d'Urville</exemplarCity>
+				<exemplarCity>Dumont d’Urville</exemplarCity>
+			</zone>
+			<zone type="America/St_Barthelemy">
+				<exemplarCity>St. Barthelemy</exemplarCity>
+			</zone>
+			<zone type="America/Coral_Harbour">
+				<exemplarCity>Atikokan</exemplarCity>
 			</zone>
 			<zone type="America/St_Johns">
-				<exemplarCity>St. John's</exemplarCity>
+				<exemplarCity>St. John’s</exemplarCity>
+			</zone>
+			<zone type="Africa/Asmera">
+				<exemplarCity>Asmara</exemplarCity>
+			</zone>
+			<zone type="Pacific/Truk">
+				<exemplarCity>Chuuk</exemplarCity>
+			</zone>
+			<zone type="Pacific/Ponape">
+				<exemplarCity>Pohnpei</exemplarCity>
+			</zone>
+			<zone type="Atlantic/Faeroe">
+				<exemplarCity>Faroe</exemplarCity>
+			</zone>
+			<zone type="America/Godthab">
+				<exemplarCity>Nuuk</exemplarCity>
+			</zone>
+			<zone type="America/Scoresbysund">
+				<exemplarCity>Ittoqqortoormiit</exemplarCity>
+			</zone>
+			<zone type="Asia/Calcutta">
+				<exemplarCity>Kolkata</exemplarCity>
+			</zone>
+			<zone type="America/St_Kitts">
+				<exemplarCity>St. Kitts</exemplarCity>
+			</zone>
+			<zone type="America/St_Lucia">
+				<exemplarCity>St. Lucia</exemplarCity>
+			</zone>
+			<zone type="Asia/Katmandu">
+				<exemplarCity>Kathmandu</exemplarCity>
+			</zone>
+			<zone type="Atlantic/St_Helena">
+				<exemplarCity>St. Helena</exemplarCity>
+			</zone>
+			<zone type="America/Lower_Princes">
+				<exemplarCity>Lower Prince's Quarter</exemplarCity>
+			</zone>
+			<zone type="America/North_Dakota/Beulah">
+				<exemplarCity>Beulah, North Dakota</exemplarCity>
 			</zone>
 			<zone type="America/North_Dakota/New_Salem">
 				<exemplarCity>New Salem, North Dakota</exemplarCity>
@@ -1591,1527 +2517,931 @@
 			<zone type="America/Kentucky/Monticello">
 				<exemplarCity>Monticello, Kentucky</exemplarCity>
 			</zone>
-			<metazone type="Acre">
-				<short>
-					<standard>ACT (Acre)</standard>
-					<daylight>ACST (Acre)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Afghanistan">
-				<short>
-					<standard>AFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Central">
-				<short>
-					<standard>CAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Eastern">
-				<short>
-					<standard>EAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Southern">
-				<short>
-					<standard>SAST</standard>
-				</short>
-			</metazone>
-			<metazone type="Africa_Western">
-				<short>
-					<standard>WAT</standard>
-					<daylight>WAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aktyubinsk">
-				<short>
-					<standard>AKTT</standard>
-					<daylight>AKTST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska">
-				<short>
-					<standard>AKST</standard>
-					<daylight>AKDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Alaska_Hawaii">
-				<short>
-					<standard>AHST</standard>
-					<daylight>AHDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Almaty">
-				<short>
-					<standard>ALMT</standard>
-					<daylight>ALMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Amazon">
-				<short>
-					<standard>AMT</standard>
-					<daylight>AMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Central">
-				<short>
-					<standard>CST</standard>
-					<daylight>CDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Eastern">
-				<short>
-					<standard>EST</standard>
-					<daylight>EDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Mountain">
-				<short>
-					<standard>MST</standard>
-					<daylight>MDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="America_Pacific">
-				<short>
-					<standard>PST</standard>
-					<daylight>PDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Anadyr">
-				<short>
-					<standard>ANAT</standard>
-					<daylight>ANAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtau">
-				<short>
-					<standard>AQTT (Aqtau)</standard>
-					<daylight>AQTST (Aqtau)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Aqtobe">
-				<short>
-					<standard>AQTT (Aqtobe)</standard>
-					<daylight>AQTST (Aqtobe)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Arabian">
-				<short>
-					<standard>AST (SA)</standard>
-					<daylight>ADT (SA)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina">
-				<short>
-					<standard>ART</standard>
-					<daylight>ARST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Argentina_Western">
-				<short>
-					<standard>WART</standard>
-				</short>
-			</metazone>
-			<metazone type="Armenia">
-				<short>
-					<standard>AMT (AM)</standard>
-					<daylight>AMST (AM)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ashkhabad">
-				<short>
-					<standard>ASHT</standard>
-					<daylight>ASHST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Atlantic">
-				<short>
-					<standard>AST</standard>
-					<daylight>ADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Central">
-				<short>
-					<standard>ACST</standard>
-					<daylight>ACDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_CentralWestern">
-				<short>
-					<standard>ACWST</standard>
-					<daylight>ACWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Eastern">
-				<short>
-					<standard>AEST</standard>
-					<daylight>AEDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Australia_Western">
-				<short>
-					<standard>AWST</standard>
-					<daylight>AWDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Azerbaijan">
-				<short>
-					<standard>AZT</standard>
-					<daylight>AZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Azores">
-				<short>
-					<standard>AZOT</standard>
-					<daylight>AZOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Baku">
-				<short>
-					<standard>BAKT</standard>
-					<daylight>BAKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bangladesh">
-				<short>
-					<standard>BDT</standard>
-					<daylight>BDST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bering">
-				<short>
-					<standard>BST (Bering)</standard>
-					<daylight>BDT (Bering)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Bhutan">
-				<short>
-					<standard>BTT</standard>
-				</short>
-			</metazone>
-			<metazone type="Bolivia">
-				<short>
-					<standard>BOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Borneo">
-				<short>
-					<standard>BORT</standard>
-					<daylight>BORST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brasilia">
-				<short>
-					<standard>BRT</standard>
-					<daylight>BRST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Brunei">
-				<short>
-					<standard>BNT</standard>
-				</short>
-			</metazone>
-			<metazone type="Cape_Verde">
-				<short>
-					<standard>CVT</standard>
-					<daylight>CVST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chamorro">
-				<short>
-					<standard>ChST</standard>
-				</short>
-			</metazone>
-			<metazone type="Changbai">
-				<short>
-					<standard>CHAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Chatham">
-				<short>
-					<standard>CHAST</standard>
-					<daylight>CHADT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Chile">
-				<short>
-					<standard>CLT</standard>
-					<daylight>CLST</daylight>
-				</short>
-			</metazone>
-			<metazone type="China">
-				<short>
-					<standard>CST (CN)</standard>
-					<daylight>CDT (CN)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Choibalsan">
-				<short>
-					<standard>CHOT</standard>
-					<daylight>CHOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Christmas">
-				<short>
-					<standard>CXT</standard>
-				</short>
-			</metazone>
-			<metazone type="Cocos">
-				<short>
-					<standard>CCT</standard>
-				</short>
-			</metazone>
-			<metazone type="Colombia">
-				<short>
-					<standard>COT</standard>
-					<daylight>COST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cook">
-				<short>
-					<standard>CKT</standard>
-					<daylight>CKHST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Cuba">
-				<short>
-					<standard>CST (CU)</standard>
-					<daylight>CDT (CU)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dacca">
-				<short>
-					<standard>DACT</standard>
-				</short>
-			</metazone>
-			<metazone type="Davis">
-				<short>
-					<standard>DAVT</standard>
-				</short>
-			</metazone>
-			<metazone type="DumontDUrville">
-				<short>
-					<standard>DDUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Dushanbe">
-				<short>
-					<standard>DUST</standard>
-					<daylight>DUSST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Dutch_Guiana">
-				<short>
-					<standard>NEGT</standard>
-				</short>
-			</metazone>
-			<metazone type="East_Timor">
-				<short>
-					<standard>TLT</standard>
-				</short>
-			</metazone>
-			<metazone type="Easter">
-				<short>
-					<standard>EAST</standard>
-					<daylight>EASST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Ecuador">
-				<short>
-					<standard>ECT</standard>
-				</short>
-			</metazone>
-			<metazone type="Europe_Central">
-				<short>
-					<standard>CET</standard>
-					<daylight>CEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Eastern">
-				<short>
-					<standard>EET</standard>
-					<daylight>EEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Europe_Western">
-				<short>
-					<standard>WET</standard>
-					<daylight>WEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Falkland">
-				<short>
-					<standard>FKT</standard>
-					<daylight>FKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Fiji">
-				<short>
-					<standard>FJT</standard>
-					<daylight>FJST</daylight>
-				</short>
-			</metazone>
-			<metazone type="French_Guiana">
-				<short>
-					<standard>GFT</standard>
-				</short>
-			</metazone>
-			<metazone type="French_Southern">
-				<short>
-					<standard>TFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Frunze">
-				<short>
-					<standard>FRUT</standard>
-					<daylight>FRUST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Galapagos">
-				<short>
-					<standard>GALT</standard>
-				</short>
-			</metazone>
-			<metazone type="Gambier">
-				<short>
-					<standard>GAMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Georgia">
-				<short>
-					<standard>GET</standard>
-					<daylight>GEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Gilbert_Islands">
-				<short>
-					<standard>GILT</standard>
-				</short>
-			</metazone>
-			<metazone type="GMT">
-				<short>
-					<standard>GMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Central">
-				<short>
-					<standard>CGT</standard>
-					<daylight>CGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Eastern">
-				<short>
-					<standard>EGT</standard>
-					<daylight>EGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Greenland_Western">
-				<short>
-					<standard>WGT</standard>
-					<daylight>WGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Guam">
-				<short>
-					<standard>GST (GU)</standard>
-				</short>
-			</metazone>
-			<metazone type="Gulf">
-				<short>
-					<standard>GST</standard>
-				</short>
-			</metazone>
-			<metazone type="Guyana">
-				<short>
-					<standard>GYT</standard>
-				</short>
-			</metazone>
-			<metazone type="Hawaii_Aleutian">
-				<short>
-					<standard>HST</standard>
-				</short>
-			</metazone>
-			<metazone type="Hong_Kong">
-				<short>
-					<standard>HKT</standard>
-					<daylight>HKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Hovd">
-				<short>
-					<standard>HOVT</standard>
-					<daylight>HOVST</daylight>
-				</short>
-			</metazone>
-			<metazone type="India">
-				<short>
-					<standard>IST</standard>
-				</short>
-			</metazone>
-			<metazone type="Indian_Ocean">
-				<short>
-					<standard>IOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indochina">
-				<short>
-					<standard>ICT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Central">
-				<short>
-					<standard>CIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Eastern">
-				<short>
-					<standard>EIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Indonesia_Western">
-				<short>
-					<standard>WIT</standard>
-				</short>
-			</metazone>
-			<metazone type="Iran">
-				<short>
-					<standard>IRST</standard>
-					<daylight>IRDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Irkutsk">
-				<short>
-					<standard>IRKT</standard>
-					<daylight>IRKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Israel">
-				<short>
-					<standard>IST (IL)</standard>
-					<daylight>IDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Japan">
-				<short>
-					<standard>JST</standard>
-					<daylight>JDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kamchatka">
-				<short>
-					<standard>PETT</standard>
-					<daylight>PETST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Karachi">
-				<short>
-					<standard>KART</standard>
-				</short>
-			</metazone>
-			<metazone type="Kashgar">
-				<short>
-					<standard>KAST</standard>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Eastern">
-				<short>
-					<standard>EKST</standard>
-				</short>
-			</metazone>
-			<metazone type="Kazakhstan_Western">
-				<short>
-					<standard>WKST</standard>
-				</short>
-			</metazone>
-			<metazone type="Kizilorda">
-				<short>
-					<standard>KIZT</standard>
-					<daylight>KIZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Korea">
-				<short>
-					<standard>KST</standard>
-					<daylight>KDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kosrae">
-				<short>
-					<standard>KOST</standard>
-				</short>
-			</metazone>
-			<metazone type="Krasnoyarsk">
-				<short>
-					<standard>KRAT</standard>
-					<daylight>KRAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kuybyshev">
-				<short>
-					<standard>KUYT</standard>
-					<daylight>KUYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Kwajalein">
-				<short>
-					<standard>KWAT</standard>
-				</short>
-			</metazone>
-			<metazone type="Kyrgystan">
-				<short>
-					<standard>KGT</standard>
-				</short>
-			</metazone>
-			<metazone type="Lanka">
-				<short>
-					<standard>LKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Line_Islands">
-				<short>
-					<standard>LINT</standard>
-				</short>
-			</metazone>
-			<metazone type="Long_Shu">
-				<short>
-					<standard>LONT</standard>
-				</short>
-			</metazone>
-			<metazone type="Lord_Howe">
-				<short>
-					<standard>LHST</standard>
-					<daylight>LHDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Macau">
-				<short>
-					<standard>MOT</standard>
-					<daylight>MOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Magadan">
-				<short>
-					<standard>MAGT</standard>
-					<daylight>MAGST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Malaya">
-				<short>
-					<standard>MALT</standard>
-				</short>
-			</metazone>
-			<metazone type="Malaysia">
-				<short>
-					<standard>MYT</standard>
-				</short>
-			</metazone>
-			<metazone type="Maldives">
-				<short>
-					<standard>MVT</standard>
-				</short>
-			</metazone>
-			<metazone type="Marquesas">
-				<short>
-					<standard>MART</standard>
-				</short>
-			</metazone>
-			<metazone type="Marshall_Islands">
-				<short>
-					<standard>MHT</standard>
-				</short>
-			</metazone>
-			<metazone type="Mauritius">
-				<short>
-					<standard>MUT</standard>
-					<daylight>MUST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Mawson">
-				<short>
-					<standard>MAWT</standard>
-				</short>
-			</metazone>
-			<metazone type="Mongolia">
-				<short>
-					<standard>ULAT</standard>
-					<daylight>ULAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Moscow">
-				<short>
-					<standard>MSK</standard>
-					<daylight>MSKS</daylight>
-				</short>
-			</metazone>
-			<metazone type="Myanmar">
-				<short>
-					<standard>MMT</standard>
-				</short>
-			</metazone>
-			<metazone type="Nauru">
-				<short>
-					<standard>NRT</standard>
-				</short>
-			</metazone>
-			<metazone type="Nepal">
-				<short>
-					<standard>NPT</standard>
-				</short>
-			</metazone>
-			<metazone type="New_Caledonia">
-				<short>
-					<standard>NCT</standard>
-					<daylight>NCST</daylight>
-				</short>
-			</metazone>
-			<metazone type="New_Zealand">
-				<short>
-					<standard>NZST</standard>
-					<daylight>NZDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Newfoundland">
-				<short>
-					<standard>NST</standard>
-					<daylight>NDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Niue">
-				<short>
-					<standard>NUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Norfolk">
-				<short>
-					<standard>NFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Noronha">
-				<short>
-					<standard>FNT</standard>
-					<daylight>FNST</daylight>
-				</short>
-			</metazone>
-			<metazone type="North_Mariana">
-				<short>
-					<standard>MPT</standard>
-				</short>
-			</metazone>
-			<metazone type="Novosibirsk">
-				<short>
-					<standard>NOVT</standard>
-					<daylight>NOVST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Omsk">
-				<short>
-					<standard>OMST</standard>
-					<daylight>OMSST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Pakistan">
-				<short>
-					<standard>PKT</standard>
-					<daylight>PKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Palau">
-				<short>
-					<standard>PWT</standard>
-				</short>
-			</metazone>
-			<metazone type="Papua_New_Guinea">
-				<short>
-					<standard>PGT</standard>
-				</short>
-			</metazone>
-			<metazone type="Paraguay">
-				<short>
-					<standard>PYT</standard>
-					<daylight>PYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Peru">
-				<short>
-					<standard>PET</standard>
-					<daylight>PEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Philippines">
-				<short>
-					<standard>PHT</standard>
-					<daylight>PHST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Phoenix_Islands">
-				<short>
-					<standard>PHOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Pierre_Miquelon">
-				<short>
-					<standard>PMST</standard>
-					<daylight>PMDT</daylight>
-				</short>
-			</metazone>
-			<metazone type="Pitcairn">
-				<short>
-					<standard>PNT</standard>
-				</short>
-			</metazone>
-			<metazone type="Ponape">
-				<short>
-					<standard>PONT</standard>
-				</short>
-			</metazone>
-			<metazone type="Qyzylorda">
-				<short>
-					<standard>QYZT</standard>
-					<daylight>QYZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Reunion">
-				<short>
-					<standard>RET</standard>
-				</short>
-			</metazone>
-			<metazone type="Rothera">
-				<short>
-					<standard>ROTT</standard>
-				</short>
-			</metazone>
-			<metazone type="Sakhalin">
-				<short>
-					<standard>SAKT</standard>
-					<daylight>SAKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samara">
-				<short>
-					<standard>SAMT</standard>
-					<daylight>SAMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samarkand">
-				<short>
-					<standard>SAMT (Samarkand)</standard>
-					<daylight>SAMST (Samarkand)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Samoa">
-				<short>
-					<standard>SST</standard>
-				</short>
-			</metazone>
-			<metazone type="Seychelles">
-				<short>
-					<standard>SCT</standard>
-				</short>
-			</metazone>
-			<metazone type="Shevchenko">
-				<short>
-					<standard>SHET</standard>
-					<daylight>SHEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Singapore">
-				<short>
-					<standard>SGT</standard>
-				</short>
-			</metazone>
-			<metazone type="Solomon">
-				<short>
-					<standard>SBT</standard>
-				</short>
-			</metazone>
-			<metazone type="South_Georgia">
-				<short>
-					<standard>GST (GS)</standard>
-				</short>
-			</metazone>
-			<metazone type="Suriname">
-				<short>
-					<standard>SRT</standard>
-				</short>
-			</metazone>
-			<metazone type="Sverdlovsk">
-				<short>
-					<standard>SVET</standard>
-					<daylight>SVEST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Syowa">
-				<short>
-					<standard>SYOT</standard>
-				</short>
-			</metazone>
-			<metazone type="Tahiti">
-				<short>
-					<standard>TAHT</standard>
-				</short>
-			</metazone>
-			<metazone type="Taipei">
-				<short>
-					<standard>CST (TW)</standard>
-					<daylight>CDT (TW)</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tajikistan">
-				<short>
-					<standard>TJT</standard>
-				</short>
-			</metazone>
-			<metazone type="Tashkent">
-				<short>
-					<standard>TAST</standard>
-					<daylight>TASST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tbilisi">
-				<short>
-					<standard>TBIT</standard>
-					<daylight>TBIST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tokelau">
-				<short>
-					<standard>TKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Tonga">
-				<short>
-					<standard>TOT</standard>
-					<daylight>TOST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Truk">
-				<short>
-					<standard>TRUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Turkey">
-				<short>
-					<standard>TRT</standard>
-					<daylight>TRST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Turkmenistan">
-				<short>
-					<standard>TMT</standard>
-					<daylight>TMST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Tuvalu">
-				<short>
-					<standard>TVT</standard>
-				</short>
-			</metazone>
-			<metazone type="Uralsk">
-				<short>
-					<standard>URAT</standard>
-					<daylight>URAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Uruguay">
-				<short>
-					<standard>UYT</standard>
-					<daylight>UYST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Urumqi">
-				<short>
-					<standard>URUT</standard>
-				</short>
-			</metazone>
-			<metazone type="Uzbekistan">
-				<short>
-					<standard>UZT</standard>
-					<daylight>UZST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Vanuatu">
-				<short>
-					<standard>VUT</standard>
-					<daylight>VUST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Venezuela">
-				<short>
-					<standard>VET</standard>
-				</short>
-			</metazone>
-			<metazone type="Vladivostok">
-				<short>
-					<standard>VLAT</standard>
-					<daylight>VLAST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Volgograd">
-				<short>
-					<standard>VOLT</standard>
-					<daylight>VOLST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Vostok">
-				<short>
-					<standard>VOST</standard>
-				</short>
-			</metazone>
-			<metazone type="Wake">
-				<short>
-					<standard>WAKT</standard>
-				</short>
-			</metazone>
-			<metazone type="Wallis">
-				<short>
-					<standard>WFT</standard>
-				</short>
-			</metazone>
-			<metazone type="Yakutsk">
-				<short>
-					<standard>YAKT</standard>
-					<daylight>YAKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yekaterinburg">
-				<short>
-					<standard>YEKT</standard>
-					<daylight>YEKST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yerevan">
-				<short>
-					<standard>YERT</standard>
-					<daylight>YERST</daylight>
-				</short>
-			</metazone>
-			<metazone type="Yukon">
-				<short>
-					<standard>YST</standard>
-					<daylight>YDT</daylight>
-				</short>
-			</metazone>
+			<zone type="America/St_Vincent">
+				<exemplarCity>St. Vincent</exemplarCity>
+			</zone>
+			<zone type="America/St_Thomas">
+				<exemplarCity>St. Thomas</exemplarCity>
+			</zone>
+			<zone type="Asia/Saigon">
+				<exemplarCity>Ho Chi Minh</exemplarCity>
+			</zone>
 		</timeZoneNames>
 	</dates>
 	<numbers>
 		<defaultNumberingSystem>latn</defaultNumberingSystem>
+		<otherNumberingSystems>
+			<native>latn</native>
+		</otherNumberingSystems>
 		<symbols>
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="arab">
+			<decimal>٫</decimal>
+			<group>٬</group>
+			<list>؛</list>
+			<percentSign>٪</percentSign>
+			<plusSign>‏+</plusSign> <!-- includes RLM before sign -->
+			<minusSign>‏-</minusSign> <!-- includes RLM before sign (002D) -->
+			<exponential>اس</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>؉</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="arabext">
+			<decimal>٫</decimal>
+			<group>٬</group>
+			<list>؛</list>
+			<percentSign>٪</percentSign>
+			<plusSign>‎+‎</plusSign> <!-- includes LRM before and after sign -->
+			<minusSign>‎-‎</minusSign> <!-- includes LRM before and after sign (002D) -->
+			<exponential>×۱۰^</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
+			<perMille>؉</perMille>
+			<infinity>∞</infinity>
+			<nan>NaN</nan>
+		</symbols>
+		<symbols numberSystem="bali">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="beng">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="brah">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="cakm">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="cham">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="deva">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="fullwide">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="gujr">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="guru">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="hanidec">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="java">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="kali">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="khmr">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="knda">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="lana">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="lanatham">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="laoo">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="latn">
 			<decimal>.</decimal>
 			<group>,</group>
 			<list>;</list>
 			<percentSign>%</percentSign>
-			<nativeZeroDigit>0</nativeZeroDigit>
-			<patternDigit>#</patternDigit>
 			<plusSign>+</plusSign>
 			<minusSign>-</minusSign>
 			<exponential>E</exponential>
+			<superscriptingExponent>×</superscriptingExponent>
 			<perMille>‰</perMille>
 			<infinity>∞</infinity>
 			<nan>NaN</nan>
 		</symbols>
+		<symbols numberSystem="lepc">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="limb">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="mlym">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="mong">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="mtei">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="mymr">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="mymrshan">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="nkoo">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="olck">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="orya">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="osma">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="saur">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="shrd">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="sora">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="sund">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="takr">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="talu">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="tamldec">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="telu">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="thai">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="tibt">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
+		<symbols numberSystem="vaii">
+			<alias source="locale" path="../symbols[@numberSystem='latn']"/>
+		</symbols>
 		<decimalFormats>
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="arab">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="arabext">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="bali">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="beng">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="brah">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="cakm">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="cham">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="deva">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="fullwide">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="gujr">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="guru">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="hanidec">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="java">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="kali">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="khmr">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="knda">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="lana">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="lanatham">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="laoo">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="latn">
 			<decimalFormatLength>
 				<decimalFormat>
 					<pattern>#,##0.###</pattern>
 				</decimalFormat>
 			</decimalFormatLength>
+			<decimalFormatLength type="long">
+				<alias source="locale" path="../decimalFormatLength[@type='short']"/>
+			</decimalFormatLength>
+			<decimalFormatLength type="short">
+				<decimalFormat>
+					<pattern type="1000" count="other">0K</pattern>
+					<pattern type="10000" count="other">00K</pattern>
+					<pattern type="100000" count="other">000K</pattern>
+					<pattern type="1000000" count="other">0M</pattern>
+					<pattern type="10000000" count="other">00M</pattern>
+					<pattern type="100000000" count="other">000M</pattern>
+					<pattern type="1000000000" count="other">0G</pattern>
+					<pattern type="10000000000" count="other">00G</pattern>
+					<pattern type="100000000000" count="other">000G</pattern>
+					<pattern type="1000000000000" count="other">0T</pattern>
+					<pattern type="10000000000000" count="other">00T</pattern>
+					<pattern type="100000000000000" count="other">000T</pattern>
+				</decimalFormat>
+			</decimalFormatLength>
+		</decimalFormats>
+		<decimalFormats numberSystem="lepc">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="limb">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="mlym">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="mong">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="mtei">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="mymr">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="mymrshan">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="nkoo">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="olck">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="orya">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="osma">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="saur">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="shrd">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="sora">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="sund">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="takr">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="talu">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="tamldec">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="telu">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="thai">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="tibt">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
+		</decimalFormats>
+		<decimalFormats numberSystem="vaii">
+			<alias source="locale" path="../decimalFormats[@numberSystem='latn']"/>
 		</decimalFormats>
 		<scientificFormats>
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="arab">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="arabext">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="bali">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="beng">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="brah">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="cakm">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="cham">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="deva">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="fullwide">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="gujr">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="guru">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="hanidec">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="java">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="kali">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="khmr">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="knda">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="lana">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="lanatham">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="laoo">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="latn">
 			<scientificFormatLength>
 				<scientificFormat>
 					<pattern>#E0</pattern>
 				</scientificFormat>
 			</scientificFormatLength>
 		</scientificFormats>
+		<scientificFormats numberSystem="lepc">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="limb">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="mlym">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="mong">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="mtei">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="mymr">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="mymrshan">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="nkoo">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="olck">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="orya">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="osma">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="saur">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="shrd">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="sora">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="sund">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="takr">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="talu">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="tamldec">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="telu">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="thai">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="tibt">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
+		<scientificFormats numberSystem="vaii">
+			<alias source="locale" path="../scientificFormats[@numberSystem='latn']"/>
+		</scientificFormats>
 		<percentFormats>
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="arab">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="arabext">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="bali">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="beng">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="brah">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="cakm">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="cham">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="deva">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="fullwide">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="gujr">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="guru">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="hanidec">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="java">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="kali">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="khmr">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="knda">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="lana">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="lanatham">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="laoo">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="latn">
 			<percentFormatLength>
 				<percentFormat>
 					<pattern>#,##0%</pattern>
 				</percentFormat>
 			</percentFormatLength>
 		</percentFormats>
+		<percentFormats numberSystem="lepc">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="limb">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="mlym">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="mong">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="mtei">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="mymr">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="mymrshan">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="nkoo">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="olck">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="orya">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="osma">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="saur">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="shrd">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="sora">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="sund">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="takr">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="talu">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="tamldec">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="telu">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="thai">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="tibt">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
+		<percentFormats numberSystem="vaii">
+			<alias source="locale" path="../percentFormats[@numberSystem='latn']"/>
+		</percentFormats>
 		<currencyFormats>
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="arab">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="arabext">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="bali">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="beng">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="brah">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="cakm">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="cham">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="deva">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="fullwide">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="gujr">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="guru">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="hanidec">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="java">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="kali">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="khmr">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="knda">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="lana">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="lanatham">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="laoo">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="latn">
 			<currencySpacing>
 				<beforeCurrency>
-					<currencyMatch>[:letter:]</currencyMatch>
+					<currencyMatch>[:^S:]</currencyMatch>
 					<surroundingMatch>[:digit:]</surroundingMatch>
 					<insertBetween> </insertBetween>
 				</beforeCurrency>
 				<afterCurrency>
-					<currencyMatch>[:letter:]</currencyMatch>
+					<currencyMatch>[:^S:]</currencyMatch>
 					<surroundingMatch>[:digit:]</surroundingMatch>
 					<insertBetween> </insertBetween>
 				</afterCurrency>
 			</currencySpacing>
 			<currencyFormatLength>
-				<currencyFormat>
+				<currencyFormat type="standard">
 					<pattern>¤ #,##0.00</pattern>
 				</currencyFormat>
+				<currencyFormat type="accounting">
+					<alias source="locale" path="../currencyFormat[@type='standard']"/>
+				</currencyFormat>
 			</currencyFormatLength>
 			<unitPattern count="other">{0} {1}</unitPattern>
 		</currencyFormats>
+		<currencyFormats numberSystem="lepc">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="limb">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="mlym">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="mong">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="mtei">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymr">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="mymrshan">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="nkoo">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="olck">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="orya">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="osma">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="saur">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="shrd">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="sora">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="sund">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="takr">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="talu">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="tamldec">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="telu">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="thai">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="tibt">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
+		<currencyFormats numberSystem="vaii">
+			<alias source="locale" path="../currencyFormats[@numberSystem='latn']"/>
+		</currencyFormats>
 		<currencies>
-			<currency type="AFN">
-				<symbol>Af</symbol>
-			</currency>
-			<currency type="ANG">
-				<symbol>NAf.</symbol>
-			</currency>
-			<currency type="AOA">
-				<symbol>Kz</symbol>
-			</currency>
-			<currency type="ARA">
-				<symbol>₳</symbol>
-			</currency>
-			<currency type="ARL">
-				<symbol>$L</symbol>
-			</currency>
-			<currency type="ARM">
-				<symbol>m$n</symbol>
-			</currency>
 			<currency type="ARS">
-				<symbol>AR$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="AUD">
-				<symbol>AU$</symbol>
-			</currency>
-			<currency type="AWG">
-				<symbol>Afl.</symbol>
-			</currency>
-			<currency type="AZN">
-				<symbol>man.</symbol>
-			</currency>
-			<currency type="BAM">
-				<symbol>KM</symbol>
+				<symbol>A$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="BBD">
-				<symbol>Bds$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="BDT">
-				<symbol>Tk</symbol>
-			</currency>
-			<currency type="BEF">
-				<symbol>BF</symbol>
-			</currency>
-			<currency type="BHD">
-				<symbol>BD</symbol>
-			</currency>
-			<currency type="BIF">
-				<symbol>FBu</symbol>
+				<symbol alt="narrow">৳</symbol>
 			</currency>
 			<currency type="BMD">
-				<symbol>BD$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="BND">
-				<symbol>BN$</symbol>
-			</currency>
-			<currency type="BOB">
-				<symbol>Bs</symbol>
-			</currency>
-			<currency type="BOP">
-				<symbol>$b.</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="BRL">
 				<symbol>R$</symbol>
+				<symbol alt="narrow">R$</symbol>
 			</currency>
 			<currency type="BSD">
-				<symbol>BS$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
-			<currency type="BTN">
-				<symbol>Nu.</symbol>
-			</currency>
-			<currency type="BWP">
-				<symbol>BWP</symbol>
+			<currency type="BYR">
+				<symbol alt="narrow">р.</symbol>
 			</currency>
 			<currency type="BZD">
-				<symbol>BZ$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="CAD">
 				<symbol>CA$</symbol>
-			</currency>
-			<currency type="CDF">
-				<symbol>CDF</symbol>
-			</currency>
-			<currency type="CHF">
-				<symbol>Fr.</symbol>
-			</currency>
-			<currency type="CLE">
-				<symbol>Eº</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="CLP">
-				<symbol>CL$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="CNY">
 				<symbol>CN¥</symbol>
+				<symbol alt="narrow">¥</symbol>
 			</currency>
 			<currency type="COP">
-				<symbol>CO$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="CRC">
-				<symbol>₡</symbol>
-			</currency>
-			<currency type="CUC">
-				<symbol>CUC$</symbol>
+				<symbol alt="narrow">₡</symbol>
 			</currency>
 			<currency type="CUP">
-				<symbol>CU$</symbol>
-			</currency>
-			<currency type="CVE">
-				<symbol>CV$</symbol>
-			</currency>
-			<currency type="CYP">
-				<symbol>CY£</symbol>
-			</currency>
-			<currency type="CZK">
-				<symbol>Kč</symbol>
-			</currency>
-			<currency type="DEM">
-				<symbol>DM</symbol>
-			</currency>
-			<currency type="DJF">
-				<symbol>Fdj</symbol>
-			</currency>
-			<currency type="DKK">
-				<symbol>Dkr</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="DOP">
-				<symbol>RD$</symbol>
-			</currency>
-			<currency type="DZD">
-				<symbol>DA</symbol>
-			</currency>
-			<currency type="EEK">
-				<symbol>Ekr</symbol>
-			</currency>
-			<currency type="EGP">
-				<symbol>EG£</symbol>
-			</currency>
-			<currency type="ERN">
-				<symbol>Nfk</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="ESP">
-				<symbol>Pts</symbol>
-			</currency>
-			<currency type="ETB">
-				<symbol>Br</symbol>
+				<symbol alt="narrow">₧</symbol>
 			</currency>
 			<currency type="EUR">
 				<symbol>€</symbol>
-			</currency>
-			<currency type="FIM">
-				<symbol>mk</symbol>
+				<symbol alt="narrow">€</symbol>
 			</currency>
 			<currency type="FJD">
-				<symbol>FJ$</symbol>
-			</currency>
-			<currency type="FKP">
-				<symbol>FK£</symbol>
-			</currency>
-			<currency type="FRF">
-				<symbol>₣</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="GBP">
 				<symbol>£</symbol>
-			</currency>
-			<currency type="GHC">
-				<symbol>₵</symbol>
+				<symbol alt="narrow">£</symbol>
 			</currency>
 			<currency type="GHS">
-				<symbol>GH₵</symbol>
+				<symbol alt="narrow">₵</symbol>
 			</currency>
 			<currency type="GIP">
-				<symbol>GI£</symbol>
-			</currency>
-			<currency type="GMD">
-				<symbol>GMD</symbol>
-			</currency>
-			<currency type="GNF">
-				<symbol>FG</symbol>
-			</currency>
-			<currency type="GRD">
-				<symbol>₯</symbol>
-			</currency>
-			<currency type="GTQ">
-				<symbol>GTQ</symbol>
+				<symbol alt="narrow">£</symbol>
 			</currency>
 			<currency type="GYD">
-				<symbol>GY$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="HKD">
 				<symbol>HK$</symbol>
-			</currency>
-			<currency type="HNL">
-				<symbol>HNL</symbol>
-			</currency>
-			<currency type="HRK">
-				<symbol>kn</symbol>
-			</currency>
-			<currency type="HTG">
-				<symbol>HTG</symbol>
-			</currency>
-			<currency type="HUF">
-				<symbol>Ft</symbol>
-			</currency>
-			<currency type="IDR">
-				<symbol>Rp</symbol>
-			</currency>
-			<currency type="IEP">
-				<symbol>IR£</symbol>
-			</currency>
-			<currency type="ILP">
-				<symbol>I£</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="ILS">
 				<symbol>₪</symbol>
+				<symbol alt="narrow">₪</symbol>
 			</currency>
 			<currency type="INR">
-				<symbol>Rs</symbol>
-			</currency>
-			<currency type="ISK">
-				<symbol>Ikr</symbol>
-			</currency>
-			<currency type="ITL">
-				<symbol>IT₤</symbol>
+				<symbol>₹</symbol>
+				<symbol alt="narrow">₹</symbol>
 			</currency>
 			<currency type="JMD">
-				<symbol>J$</symbol>
-			</currency>
-			<currency type="JOD">
-				<symbol>JD</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="JPY">
 				<symbol>JP¥</symbol>
+				<symbol alt="narrow">¥</symbol>
 			</currency>
-			<currency type="KES">
-				<symbol>Ksh</symbol>
-			</currency>
-			<currency type="KMF">
-				<symbol>CF</symbol>
+			<currency type="KHR">
+				<symbol alt="narrow">៛</symbol>
 			</currency>
 			<currency type="KRW">
 				<symbol>₩</symbol>
-			</currency>
-			<currency type="KWD">
-				<symbol>KD</symbol>
+				<symbol alt="narrow">₩</symbol>
 			</currency>
 			<currency type="KYD">
-				<symbol>KY$</symbol>
+				<symbol alt="narrow">$</symbol>
+			</currency>
+			<currency type="KZT">
+				<symbol alt="narrow">₸</symbol>
 			</currency>
 			<currency type="LAK">
-				<symbol>₭</symbol>
-			</currency>
-			<currency type="LBP">
-				<symbol>LB£</symbol>
-			</currency>
-			<currency type="LKR">
-				<symbol>SLRs</symbol>
+				<symbol alt="narrow">₭</symbol>
 			</currency>
 			<currency type="LRD">
-				<symbol>L$</symbol>
-			</currency>
-			<currency type="LSL">
-				<symbol>LSL</symbol>
-			</currency>
-			<currency type="LTL">
-				<symbol>Lt</symbol>
-			</currency>
-			<currency type="LVL">
-				<symbol>Ls</symbol>
-			</currency>
-			<currency type="LYD">
-				<symbol>LD</symbol>
-			</currency>
-			<currency type="MMK">
-				<symbol>MMK</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="MNT">
-				<symbol>₮</symbol>
-			</currency>
-			<currency type="MOP">
-				<symbol>MOP$</symbol>
-			</currency>
-			<currency type="MRO">
-				<symbol>UM</symbol>
-			</currency>
-			<currency type="MTL">
-				<symbol>Lm</symbol>
-			</currency>
-			<currency type="MTP">
-				<symbol>MT£</symbol>
+				<symbol alt="narrow">₮</symbol>
 			</currency>
-			<currency type="MUR">
-				<symbol>MURs</symbol>
-			</currency>
-			<currency type="MXP">
+			<currency type="MXN">
 				<symbol>MX$</symbol>
-			</currency>
-			<currency type="MYR">
-				<symbol>RM</symbol>
-			</currency>
-			<currency type="MZM">
-				<symbol>Mt</symbol>
-			</currency>
-			<currency type="MZN">
-				<symbol>MTn</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="NAD">
-				<symbol>N$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="NGN">
-				<symbol>₦</symbol>
-			</currency>
-			<currency type="NIO">
-				<symbol>C$</symbol>
-			</currency>
-			<currency type="NLG">
-				<symbol>fl</symbol>
-			</currency>
-			<currency type="NOK">
-				<symbol>Nkr</symbol>
-			</currency>
-			<currency type="NPR">
-				<symbol>NPRs</symbol>
+				<symbol alt="narrow">₦</symbol>
 			</currency>
 			<currency type="NZD">
 				<symbol>NZ$</symbol>
-			</currency>
-			<currency type="PAB">
-				<symbol>B/.</symbol>
-			</currency>
-			<currency type="PEI">
-				<symbol>I/.</symbol>
-			</currency>
-			<currency type="PEN">
-				<symbol>S/.</symbol>
-			</currency>
-			<currency type="PGK">
-				<symbol>PGK</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="PHP">
-				<symbol>₱</symbol>
-			</currency>
-			<currency type="PKR">
-				<symbol>PKRs</symbol>
-			</currency>
-			<currency type="PLN">
-				<symbol>zł</symbol>
-			</currency>
-			<currency type="PTE">
-				<symbol>Esc</symbol>
+				<symbol alt="narrow">₱</symbol>
 			</currency>
 			<currency type="PYG">
-				<symbol>₲</symbol>
-			</currency>
-			<currency type="QAR">
-				<symbol>QR</symbol>
-			</currency>
-			<currency type="RHD">
-				<symbol>RH$</symbol>
+				<symbol alt="narrow">₲</symbol>
 			</currency>
-			<currency type="RON">
-				<symbol>RON</symbol>
-			</currency>
-			<currency type="RSD">
-				<symbol>din.</symbol>
-			</currency>
-			<currency type="SAR">
-				<symbol>SR</symbol>
+			<currency type="RUR">
+				<symbol alt="narrow">р.</symbol>
 			</currency>
 			<currency type="SBD">
-				<symbol>SI$</symbol>
-			</currency>
-			<currency type="SCR">
-				<symbol>SRe</symbol>
-			</currency>
-			<currency type="SDD">
-				<symbol>LSd</symbol>
-			</currency>
-			<currency type="SEK">
-				<symbol>Skr</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="SGD">
-				<symbol>S$</symbol>
-			</currency>
-			<currency type="SHP">
-				<symbol>SH£</symbol>
-			</currency>
-			<currency type="SKK">
-				<symbol>Sk</symbol>
-			</currency>
-			<currency type="SLL">
-				<symbol>Le</symbol>
-			</currency>
-			<currency type="SOS">
-				<symbol>Ssh</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="SRD">
-				<symbol>SR$</symbol>
-			</currency>
-			<currency type="SRG">
-				<symbol>Sf</symbol>
-			</currency>
-			<currency type="STD">
-				<symbol>Db</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
-			<currency type="SVC">
-				<symbol>SV₡</symbol>
-			</currency>
-			<currency type="SYP">
-				<symbol>SY£</symbol>
-			</currency>
-			<currency type="SZL">
-				<symbol>SZL</symbol>
+			<currency type="SSP">
+				<symbol alt="narrow">£</symbol>
 			</currency>
 			<currency type="THB">
 				<symbol>฿</symbol>
-			</currency>
-			<currency type="TMM">
-				<symbol>TMM</symbol>
-			</currency>
-			<currency type="TND">
-				<symbol>DT</symbol>
-			</currency>
-			<currency type="TOP">
-				<symbol>T$</symbol>
-			</currency>
-			<currency type="TRL">
-				<symbol>TRL</symbol>
+				<symbol alt="narrow">฿</symbol>
 			</currency>
 			<currency type="TRY">
-				<symbol>TL</symbol>
+				<symbol alt="narrow">₺</symbol>
+				<symbol alt="variant">TL</symbol>
 			</currency>
 			<currency type="TTD">
-				<symbol>TT$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="TWD">
 				<symbol>NT$</symbol>
-			</currency>
-			<currency type="TZS">
-				<symbol>TSh</symbol>
+				<symbol alt="narrow">NT$</symbol>
 			</currency>
 			<currency type="UAH">
-				<symbol>₴</symbol>
-			</currency>
-			<currency type="UGX">
-				<symbol>USh</symbol>
+				<symbol alt="narrow">₴</symbol>
 			</currency>
 			<currency type="USD">
 				<symbol>US$</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="UYU">
-				<symbol>$U</symbol>
-			</currency>
-			<currency type="VEF">
-				<symbol>Bs.F.</symbol>
+				<symbol alt="narrow">$</symbol>
 			</currency>
 			<currency type="VND">
 				<symbol>₫</symbol>
-			</currency>
-			<currency type="VUV">
-				<symbol>VT</symbol>
-			</currency>
-			<currency type="WST">
-				<symbol>WS$</symbol>
+				<symbol alt="narrow">₫</symbol>
 			</currency>
 			<currency type="XAF">
 				<symbol>FCFA</symbol>
@@ -3125,49 +3455,312 @@
 			<currency type="XPF">
 				<symbol>CFPF</symbol>
 			</currency>
-			<currency type="YER">
-				<symbol>YR</symbol>
-			</currency>
-			<currency type="ZAR">
-				<symbol>R</symbol>
-			</currency>
-			<currency type="ZMK">
-				<symbol>ZK</symbol>
-			</currency>
-			<currency type="ZRN">
-				<symbol>NZ</symbol>
-			</currency>
-			<currency type="ZRZ">
-				<symbol>ZRZ</symbol>
-			</currency>
-			<currency type="ZWD">
-				<symbol>Z$</symbol>
-			</currency>
 		</currencies>
+		<miscPatterns numberSystem="arab">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="arabext">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="bali">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="beng">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="brah">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="cakm">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="cham">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="deva">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="fullwide">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="gujr">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="guru">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="hanidec">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="java">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="kali">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="khmr">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="knda">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="lana">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="lanatham">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="laoo">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="latn">
+			<pattern type="atLeast">⩾{0}</pattern>
+			<pattern type="range">{0}–{1}</pattern>
+		</miscPatterns>
+		<miscPatterns numberSystem="lepc">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="limb">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="mlym">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="mong">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="mtei">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymr">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="mymrshan">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="nkoo">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="olck">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="orya">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="osma">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="saur">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="shrd">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="sora">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="sund">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="takr">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="talu">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="tamldec">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="telu">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="thai">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="tibt">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
+		<miscPatterns numberSystem="vaii">
+			<alias source="locale" path="../miscPatterns[@numberSystem='latn']"/>
+		</miscPatterns>
 	</numbers>
 	<units>
-		<unit type="day">
-			<unitPattern count="other">{0} d</unitPattern>
-		</unit>
-		<unit type="hour">
-			<unitPattern count="other">{0} h</unitPattern>
-		</unit>
-		<unit type="minute">
-			<unitPattern count="other">{0} min</unitPattern>
-		</unit>
-		<unit type="month">
-			<unitPattern count="other">{0} m</unitPattern>
-		</unit>
-		<unit type="second">
-			<unitPattern count="other">{0} s</unitPattern>
-		</unit>
-		<unit type="week">
-			<unitPattern count="other">{0} w</unitPattern>
-		</unit>
-		<unit type="year">
-			<unitPattern count="other">{0} y</unitPattern>
-		</unit>
+		<unitLength type="long">
+			<alias source="locale" path="../unitLength[@type='short']"/>
+		</unitLength>
+		<unitLength type="short">
+			<compoundUnit type="per">
+				<compoundUnitPattern>{0}/{1}</compoundUnitPattern>
+			</compoundUnit>
+			<unit type="acceleration-g-force">
+				<unitPattern count="other">{0} G</unitPattern>
+			</unit>
+			<unit type="angle-arc-minute">
+				<unitPattern count="other">{0}′</unitPattern>
+			</unit>
+			<unit type="angle-arc-second">
+				<unitPattern count="other">{0}″</unitPattern>
+			</unit>
+			<unit type="angle-degree">
+				<unitPattern count="other">{0}°</unitPattern>
+			</unit>
+			<unit type="area-acre">
+				<unitPattern count="other">{0} ac</unitPattern>
+			</unit>
+			<unit type="area-hectare">
+				<unitPattern count="other">{0} ha</unitPattern>
+			</unit>
+			<unit type="area-square-foot">
+				<unitPattern count="other">{0} ft²</unitPattern>
+			</unit>
+			<unit type="area-square-kilometer">
+				<unitPattern count="other">{0} km²</unitPattern>
+			</unit>
+			<unit type="area-square-meter">
+				<unitPattern count="other">{0} m²</unitPattern>
+			</unit>
+			<unit type="area-square-mile">
+				<unitPattern count="other">{0} mi²</unitPattern>
+			</unit>
+			<unit type="duration-day">
+				<unitPattern count="other">{0} d</unitPattern>
+			</unit>
+			<unit type="duration-hour">
+				<unitPattern count="other">{0} h</unitPattern>
+			</unit>
+			<unit type="duration-millisecond">
+				<unitPattern count="other">{0} ms</unitPattern>
+			</unit>
+			<unit type="duration-minute">
+				<unitPattern count="other">{0} min</unitPattern>
+			</unit>
+			<unit type="duration-month">
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="duration-second">
+				<unitPattern count="other">{0} s</unitPattern>
+			</unit>
+			<unit type="duration-week">
+				<unitPattern count="other">{0} w</unitPattern>
+			</unit>
+			<unit type="duration-year">
+				<unitPattern count="other">{0} y</unitPattern>
+			</unit>
+			<unit type="length-centimeter">
+				<unitPattern count="other">{0} cm</unitPattern>
+			</unit>
+			<unit type="length-foot">
+				<unitPattern count="other">{0} ft</unitPattern>
+			</unit>
+			<unit type="length-inch">
+				<unitPattern count="other">{0} in</unitPattern>
+			</unit>
+			<unit type="length-kilometer">
+				<unitPattern count="other">{0} km</unitPattern>
+			</unit>
+			<unit type="length-light-year">
+				<unitPattern count="other">{0} ly</unitPattern>
+			</unit>
+			<unit type="length-meter">
+				<unitPattern count="other">{0} m</unitPattern>
+			</unit>
+			<unit type="length-mile">
+				<unitPattern count="other">{0} mi</unitPattern>
+			</unit>
+			<unit type="length-millimeter">
+				<unitPattern count="other">{0} mm</unitPattern>
+			</unit>
+			<unit type="length-picometer">
+				<unitPattern count="other">{0} pm</unitPattern>
+			</unit>
+			<unit type="length-yard">
+				<unitPattern count="other">{0} yd</unitPattern>
+			</unit>
+			<unit type="mass-gram">
+				<unitPattern count="other">{0} g</unitPattern>
+			</unit>
+			<unit type="mass-kilogram">
+				<unitPattern count="other">{0} kg</unitPattern>
+			</unit>
+			<unit type="mass-ounce">
+				<unitPattern count="other">{0} oz</unitPattern>
+			</unit>
+			<unit type="mass-pound">
+				<unitPattern count="other">{0} lb</unitPattern>
+			</unit>
+			<unit type="power-horsepower">
+				<unitPattern count="other">{0} hp</unitPattern>
+			</unit>
+			<unit type="power-kilowatt">
+				<unitPattern count="other">{0} kW</unitPattern>
+			</unit>
+			<unit type="power-watt">
+				<unitPattern count="other">{0} W</unitPattern>
+			</unit>
+			<unit type="pressure-hectopascal">
+				<unitPattern count="other">{0} hPa</unitPattern>
+			</unit>
+			<unit type="pressure-inch-hg">
+				<unitPattern count="other">{0} inHg</unitPattern>
+			</unit>
+			<unit type="pressure-millibar">
+				<unitPattern count="other">{0} mbar</unitPattern>
+			</unit>
+			<unit type="speed-kilometer-per-hour">
+				<unitPattern count="other">{0} km/h</unitPattern>
+			</unit>
+			<unit type="speed-meter-per-second">
+				<unitPattern count="other">{0} m/s</unitPattern>
+			</unit>
+			<unit type="speed-mile-per-hour">
+				<unitPattern count="other">{0} mi/h</unitPattern>
+			</unit>
+			<unit type="temperature-celsius">
+				<unitPattern count="other">{0}°C</unitPattern>
+			</unit>
+			<unit type="temperature-fahrenheit">
+				<unitPattern count="other">{0}°F</unitPattern>
+			</unit>
+			<unit type="volume-cubic-kilometer">
+				<unitPattern count="other">{0} km³</unitPattern>
+			</unit>
+			<unit type="volume-cubic-mile">
+				<unitPattern count="other">{0} mi³</unitPattern>
+			</unit>
+			<unit type="volume-liter">
+				<unitPattern count="other">{0} l</unitPattern>
+			</unit>
+		</unitLength>
+		<unitLength type="narrow">
+			<alias source="locale" path="../unitLength[@type='short']"/>
+		</unitLength>
+		<durationUnit type="hm">
+			<durationUnitPattern>h:mm</durationUnitPattern> <!-- 33:59 -->
+		</durationUnit>
+		<durationUnit type="hms">
+			<durationUnitPattern>h:mm:ss</durationUnitPattern> <!-- 33:04:59 -->
+		</durationUnit>
+		<durationUnit type="ms">
+			<durationUnitPattern>m:ss</durationUnitPattern> <!-- 33:59 -->
+		</durationUnit>
 	</units>
+	<listPatterns>
+		<listPattern>
+			<listPatternPart type="start">{0}, {1}</listPatternPart>
+			<listPatternPart type="middle">{0}, {1}</listPatternPart>
+			<listPatternPart type="end">{0}, {1}</listPatternPart>
+			<listPatternPart type="2">{0}, {1}</listPatternPart>
+		</listPattern>
+		<listPattern type="unit">
+			<alias source="locale" path="../listPattern[@type='unit-short']"/>
+		</listPattern>
+		<listPattern type="unit-narrow">
+			<alias source="locale" path="../listPattern[@type='unit-short']"/>
+		</listPattern>
+		<listPattern type="unit-short">
+			<alias source="locale" path="../listPattern"/>
+		</listPattern>
+	</listPatterns>
 	<posix>
 		<messages>
 			<yesstr>yes:y</yesstr>